Menu
▾
▴
phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
(73) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(34) |
Feb
(110) |
Mar
(24) |
Apr
(44) |
May
(37) |
Jun
(22) |
Jul
(20) |
Aug
(28) |
Sep
(50) |
Oct
(11) |
Nov
(132) |
Dec
(595) |
| 2002 |
Jan
(1099) |
Feb
(579) |
Mar
(63) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(125) |
Sep
(101) |
Oct
(25) |
Nov
(34) |
Dec
(47) |
| 2003 |
Jan
(82) |
Feb
(182) |
Mar
(71) |
Apr
(3) |
May
(1) |
Jun
(3) |
Jul
|
Aug
|
Sep
(14) |
Oct
(6) |
Nov
(124) |
Dec
(68) |
| 2004 |
Jan
(64) |
Feb
(191) |
Mar
(199) |
Apr
(298) |
May
(252) |
Jun
(426) |
Jul
(134) |
Aug
(13) |
Sep
(96) |
Oct
(75) |
Nov
(232) |
Dec
(171) |
| 2005 |
Jan
(205) |
Feb
(165) |
Mar
(8) |
Apr
(74) |
May
(21) |
Jun
(19) |
Jul
(37) |
Aug
(69) |
Sep
(141) |
Oct
(118) |
Nov
(31) |
Dec
(7) |
| 2006 |
Jan
(5) |
Feb
(10) |
Mar
(35) |
Apr
(24) |
May
(34) |
Jun
(29) |
Jul
(5) |
Aug
(38) |
Sep
(30) |
Oct
(37) |
Nov
(30) |
Dec
(86) |
| 2007 |
Jan
(414) |
Feb
(40) |
Mar
(18) |
Apr
(10) |
May
(66) |
Jun
(60) |
Jul
(105) |
Aug
(55) |
Sep
(64) |
Oct
(7) |
Nov
(11) |
Dec
(5) |
| 2008 |
Jan
(26) |
Feb
(28) |
Mar
(79) |
Apr
(34) |
May
(61) |
Jun
(24) |
Jul
(29) |
Aug
(160) |
Sep
(62) |
Oct
(70) |
Nov
(32) |
Dec
(14) |
| 2009 |
Jan
(140) |
Feb
(135) |
Mar
(153) |
Apr
(53) |
May
(24) |
Jun
(138) |
Jul
(90) |
Aug
(46) |
Sep
(72) |
Oct
(84) |
Nov
(32) |
Dec
(4) |
| 2010 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(55) |
May
(89) |
Jun
(131) |
Jul
(41) |
Aug
(38) |
Sep
(42) |
Oct
(11) |
Nov
(27) |
Dec
(54) |
| 2011 |
Jan
(127) |
Feb
(16) |
Mar
(71) |
Apr
(52) |
May
(32) |
Jun
(31) |
Jul
(4) |
Aug
|
Sep
(45) |
Oct
(26) |
Nov
(36) |
Dec
(10) |
| 2012 |
Jan
(23) |
Feb
(6) |
Mar
(13) |
Apr
(18) |
May
(1) |
Jun
(4) |
Jul
(3) |
Aug
(12) |
Sep
(57) |
Oct
(96) |
Nov
(163) |
Dec
(124) |
| 2013 |
Jan
(11) |
Feb
(17) |
Mar
(7) |
Apr
(48) |
May
(15) |
Jun
(29) |
Jul
(12) |
Aug
|
Sep
(9) |
Oct
|
Nov
|
Dec
(3) |
| 2014 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(1) |
May
(8) |
Jun
(90) |
Jul
(104) |
Aug
(12) |
Sep
(81) |
Oct
(139) |
Nov
(111) |
Dec
(64) |
| 2015 |
Jan
(46) |
Feb
(74) |
Mar
(56) |
Apr
(61) |
May
(3) |
Jun
(7) |
Jul
(11) |
Aug
(5) |
Sep
(15) |
Oct
(1) |
Nov
(1) |
Dec
(15) |
| 2016 |
Jan
(25) |
Feb
(33) |
Mar
(24) |
Apr
(4) |
May
(24) |
Jun
(3) |
Jul
(75) |
Aug
|
Sep
(2) |
Oct
(38) |
Nov
(4) |
Dec
(18) |
| 2017 |
Jan
(8) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(14) |
Jun
|
Jul
(5) |
Aug
(9) |
Sep
|
Oct
(23) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
(9) |
Apr
(60) |
May
(1) |
Jun
|
Jul
(13) |
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
(15) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
| 2021 |
Jan
(24) |
Feb
(33) |
Mar
(1) |
Apr
|
May
(1) |
Jun
(64) |
Jul
(71) |
Aug
(114) |
Sep
(82) |
Oct
(32) |
Nov
(76) |
Dec
(86) |
| 2022 |
Jan
(162) |
Feb
(41) |
Mar
(11) |
Apr
(9) |
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
| 2023 |
Jan
|
Feb
(1) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(25) |
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
| 2024 |
Jan
(7) |
Feb
(3) |
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
|
Feb
(90) |
Mar
(19) |
Apr
|
May
(6) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ru...@us...> - 2009-09-15 08:02:30
|
Revision: 7117
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7117&view=rev
Author: rurban
Date: 2009-09-15 08:02:20 +0000 (Tue, 15 Sep 2009)
Log Message:
-----------
Bug#2761192 mysql 5.1 timestamp changes
change to no automatic update per default, only if supported
Modified Paths:
--------------
trunk/schemas/mysql-initialize.sql
Modified: trunk/schemas/mysql-initialize.sql
===================================================================
--- trunk/schemas/mysql-initialize.sql 2009-09-14 16:30:20 UTC (rev 7116)
+++ trunk/schemas/mysql-initialize.sql 2009-09-15 08:02:20 UTC (rev 7117)
@@ -113,7 +113,11 @@
rateepage INT(11) NOT NULL,
ratingvalue FLOAT NOT NULL,
rateeversion INT(11) NOT NULL,
- tstamp TIMESTAMP(14) NOT NULL,
+ tstamp TIMESTAMP,
+-- before:
+-- tstamp TIMESTAMP(14) NOT NULL,
+-- since mysql 5.1 better use:
+-- tstamp TIMESTAMP DEFAULT 0,
PRIMARY KEY (dimension, raterpage, rateepage)
);
-- for empty dimensions use extra indices. see lib/wikilens/RatingsDb.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-14 16:30:30
|
Revision: 7116
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7116&view=rev
Author: vargenau
Date: 2009-09-14 16:30:20 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
Add style for RssFeed
Modified Paths:
--------------
trunk/themes/MonoBook/main.css
Modified: trunk/themes/MonoBook/main.css
===================================================================
--- trunk/themes/MonoBook/main.css 2009-09-14 08:17:08 UTC (rev 7115)
+++ trunk/themes/MonoBook/main.css 2009-09-14 16:30:20 UTC (rev 7116)
@@ -709,6 +709,13 @@
font-style: oblique;
}
+/* RssFeed */
+div.rss { margin: 1em; padding: 1em; font-size: 0.9em; background-color: #eeeeee; border: thin dashed #aaaaaa; }
+div.feed { color: #333; margin: -0.5em; margin-bottom: 0em; padding: 0.3em; font-weight: bold; background-color: #f2f2f2; font-size: 1.2em; }
+div.itemdesc { padding-left: 1em; }
+div.rssitem { border-top: thin dashed #aaaaaa; }
+a.rssicon { font-weight:normal; font-size:small; vertical-align:middle; }
+
/**
* Calendar plugin
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-14 08:17:16
|
Revision: 7115
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7115&view=rev
Author: vargenau
Date: 2009-09-14 08:17:08 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
svn propset svn:keywords Id
Modified Paths:
--------------
trunk/pgsrc/Help%2FNewPagesPerUserPlugin
trunk/pgsrc/NewPagesPerUser
Property Changed:
----------------
trunk/pgsrc/Help%2FNewPagesPerUserPlugin
trunk/pgsrc/NewPagesPerUser
Modified: trunk/pgsrc/Help%2FNewPagesPerUserPlugin
===================================================================
--- trunk/pgsrc/Help%2FNewPagesPerUserPlugin 2009-09-14 08:11:32 UTC (rev 7114)
+++ trunk/pgsrc/Help%2FNewPagesPerUserPlugin 2009-09-14 08:17:08 UTC (rev 7115)
@@ -1,6 +1,6 @@
Date: Mon, 14 Sep 2009 10:09:46 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
-X-Rcs-Id: $Id: Help%2FRecentChangesPlugin 6837 2009-06-01 13:04:52Z vargenau $
+X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Help%2FNewPagesPerUserPlugin;
flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
Property changes on: trunk/pgsrc/Help%2FNewPagesPerUserPlugin
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/pgsrc/NewPagesPerUser
===================================================================
--- trunk/pgsrc/NewPagesPerUser 2009-09-14 08:11:32 UTC (rev 7114)
+++ trunk/pgsrc/NewPagesPerUser 2009-09-14 08:17:08 UTC (rev 7115)
@@ -1,6 +1,6 @@
Date: Mon, 14 Sep 2009 10:09:46 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
-X-Rcs-Id: $Id: MyRecentEdits 6710 2009-03-26 10:38:59Z vargenau $
+X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=NewPagesPerUser;
flags=PAGE_LOCKED;
Property changes on: trunk/pgsrc/NewPagesPerUser
___________________________________________________________________
Added: svn:keywords
+ Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-14 08:11:43
|
Revision: 7114
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7114&view=rev
Author: vargenau
Date: 2009-09-14 08:11:32 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
New action page: NewPagesPerUser
Modified Paths:
--------------
trunk/pgsrc/SpecialPages
Added Paths:
-----------
trunk/pgsrc/Help%2FNewPagesPerUserPlugin
trunk/pgsrc/NewPagesPerUser
Added: trunk/pgsrc/Help%2FNewPagesPerUserPlugin
===================================================================
--- trunk/pgsrc/Help%2FNewPagesPerUserPlugin (rev 0)
+++ trunk/pgsrc/Help%2FNewPagesPerUserPlugin 2009-09-14 08:11:32 UTC (rev 7114)
@@ -0,0 +1,68 @@
+Date: Mon, 14 Sep 2009 10:09:46 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
+X-Rcs-Id: $Id: Help%2FRecentChangesPlugin 6837 2009-06-01 13:04:52Z vargenau $
+Content-Type: application/x-phpwiki;
+ pagename=Help%2FNewPagesPerUserPlugin;
+ flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+ markup=2;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+The **~NewPagesPerUser** [[Help:WikiPlugin|plugin]] lists all new pages
+per month per user in the wiki.
+
+== Usage
+{{{
+<<NewPagesPerUser arguments>>
+}}}
+
+== Arguments
+
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **userid**
+|
+| 0
+|-
+| **month**
+|
+| 0
+|-
+| **since**
+|
+| 0
+|-
+| **until**
+|
+| 0
+|-
+| **comments**
+|
+| 0
+|-
+| **links**
+| Have a link to pages.
+| true
+|}
+
+== Example
+
+{{{
+<<~NewPagesPerUser links=0>>
+}}}
+
+<<~NewPagesPerUser links=0>>
+
+== Author
+* [[PhpWiki:ReiniUrban|Reini Urban]]
+
+== See Also
+
+<noinclude>
+----
+[[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
+</noinclude>
Added: trunk/pgsrc/NewPagesPerUser
===================================================================
--- trunk/pgsrc/NewPagesPerUser (rev 0)
+++ trunk/pgsrc/NewPagesPerUser 2009-09-14 08:11:32 UTC (rev 7114)
@@ -0,0 +1,14 @@
+Date: Mon, 14 Sep 2009 10:09:46 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
+X-Rcs-Id: $Id: MyRecentEdits 6710 2009-03-26 10:38:59Z vargenau $
+Content-Type: application/x-phpwiki;
+ pagename=NewPagesPerUser;
+ flags=PAGE_LOCKED;
+ markup=2;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+<<NewPagesPerUser>>
+
+----
+[[CategoryActionPage]]
Modified: trunk/pgsrc/SpecialPages
===================================================================
--- trunk/pgsrc/SpecialPages 2009-09-13 11:33:12 UTC (rev 7113)
+++ trunk/pgsrc/SpecialPages 2009-09-14 08:11:32 UTC (rev 7114)
@@ -1,4 +1,4 @@
-Date: Mon, 1 Jun 2009 15:05:05 +0000
+Date: Mon, 14 Sep 2009 10:09:46 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -21,6 +21,7 @@
* [[AllPagesCreatedByMe]]
* [[AllPagesOwnedByMe]]
* [[AllPagesLastEditedByMe]]
+* [[NewPagesPerUser]]
* [[LockedPages]]
* [[OrphanedPages]]
* [[MostPopular]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-13 11:33:22
|
Revision: 7113
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7113&view=rev
Author: vargenau
Date: 2009-09-13 11:33:12 +0000 (Sun, 13 Sep 2009)
Log Message:
-----------
Page XX of YY
Modified Paths:
--------------
trunk/themes/MonoBook/commonPrint.css
Modified: trunk/themes/MonoBook/commonPrint.css
===================================================================
--- trunk/themes/MonoBook/commonPrint.css 2009-09-12 04:47:01 UTC (rev 7112)
+++ trunk/themes/MonoBook/commonPrint.css 2009-09-13 11:33:12 UTC (rev 7113)
@@ -27,7 +27,7 @@
content: string(header);
}
@bottom-left {
- content: "Page " counter(page);
+ content: "Page " counter(page) " of " counter(pages);
}
}
@@ -39,7 +39,7 @@
content: "Phpwiki";
}
@bottom-right {
- content: "Page " counter(page);
+ content: "Page " counter(page) " of " counter(pages);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-12 04:47:10
|
Revision: 7112
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7112&view=rev
Author: vargenau
Date: 2009-09-12 04:47:01 +0000 (Sat, 12 Sep 2009)
Log Message:
-----------
Valid XHTML code
Modified Paths:
--------------
trunk/lib/plugin/NewPagesPerUser.php
Modified: trunk/lib/plugin/NewPagesPerUser.php
===================================================================
--- trunk/lib/plugin/NewPagesPerUser.php 2009-09-12 04:37:41 UTC (rev 7111)
+++ trunk/lib/plugin/NewPagesPerUser.php 2009-09-12 04:47:01 UTC (rev 7112)
@@ -62,7 +62,7 @@
$date = $rev->get('mtime');
//$author = $rev->get('author_id');
$author = $page->getOwner();
- if ($debug) echo "<i>$pagename, ",strftime("%Y-%m-%d %h:%m:%s", $date),", $author</i><br>\n";
+ if ($debug) echo "<i>$pagename, ",strftime("%Y-%m-%d %h:%m:%s", $date),", $author</i><br />\n";
if ($userid and (!preg_match("/".$userid."/", $author))) continue;
if ($since and $date < $since) continue;
if ($until and $date > $until) continue;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-12 04:37:51
|
Revision: 7111
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7111&view=rev
Author: vargenau
Date: 2009-09-12 04:37:41 +0000 (Sat, 12 Sep 2009)
Log Message:
-----------
Valid XHTML code
Modified Paths:
--------------
trunk/lib/plugin/NewPagesPerUser.php
Modified: trunk/lib/plugin/NewPagesPerUser.php
===================================================================
--- trunk/lib/plugin/NewPagesPerUser.php 2009-09-11 08:04:02 UTC (rev 7110)
+++ trunk/lib/plugin/NewPagesPerUser.php 2009-09-12 04:37:41 UTC (rev 7111)
@@ -92,7 +92,10 @@
(HTML::tr(HTML::td($nbsp,$nbsp,
HTML::img(array('id' => "$id-img",
'src' => $WikiTheme->_findData("images/folderArrowClosed.png"),
- 'onClick'=> "showHideFolder('$id')")),$nbsp,
+ 'onclick'=> "showHideFolder('$id')",
+ 'alt' => _("Click to hide/show"),
+ 'title' => _("Click to hide/show"))),
+ $nbsp,
$user),
HTML::td($count)
));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-11 08:04:16
|
Revision: 7110
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7110&view=rev
Author: vargenau
Date: 2009-09-11 08:04:02 +0000 (Fri, 11 Sep 2009)
Log Message:
-----------
Remove $Log
Modified Paths:
--------------
trunk/lib/WikiDB/backend/PDO_oci8.php
trunk/lib/WikiDB/backend/PDO_pgsql.php
trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
trunk/lib/WikiDB/flatfile.php
trunk/lib/WikiUser/EMailConfirm.php
trunk/lib/WysiwygEdit/spaw.php
trunk/lib/imdb.php
trunk/lib/plugin/CacheTest.php
trunk/lib/plugin/CreateBib.php
trunk/lib/plugin/Imdb.php
trunk/lib/plugin/LinkSearch.php
trunk/lib/plugin/NewPagesPerUser.php
trunk/lib/plugin/RecentEdits.php
trunk/lib/plugin/UriResolver.php
trunk/lib/plugin/_Retransform.php
Modified: trunk/lib/WikiDB/backend/PDO_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_oci8.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/WikiDB/backend/PDO_oci8.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -87,8 +87,6 @@
}
}
-// $Log: not supported by cvs2svn $
-
// (c-file-style: "gnu")
// Local Variables:
// mode: php
@@ -97,4 +95,4 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/backend/PDO_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_pgsql.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/WikiDB/backend/PDO_pgsql.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -50,8 +50,6 @@
}
}
-// $Log: not supported by cvs2svn $
-
// (c-file-style: "gnu")
// Local Variables:
// mode: php
@@ -60,4 +58,4 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -66,8 +66,6 @@
return $ahits - $bhits;
}
-// $Log: not supported by cvs2svn $
-
// For emacs users
// Local Variables:
// mode: php
Modified: trunk/lib/WikiDB/flatfile.php
===================================================================
--- trunk/lib/WikiDB/flatfile.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/WikiDB/flatfile.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -49,10 +49,6 @@
}
}
-
-// $Log: not supported by cvs2svn $
-
-
// (c-file-style: "gnu")
// Local Variables:
// mode: php
Modified: trunk/lib/WikiUser/EMailConfirm.php
===================================================================
--- trunk/lib/WikiUser/EMailConfirm.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/WikiUser/EMailConfirm.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -40,8 +40,6 @@
}
}
-// $Log: not supported by cvs2svn $
-
// Local Variables:
// mode: php
// tab-width: 8
@@ -49,4 +47,4 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WysiwygEdit/spaw.php
===================================================================
--- trunk/lib/WysiwygEdit/spaw.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/WysiwygEdit/spaw.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -46,11 +46,6 @@
}
}
-/*
- $Log: not supported by cvs2svn $
-
-*/
-
// Local Variables:
// mode: php
// tab-width: 8
@@ -58,4 +53,4 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/imdb.php
===================================================================
--- trunk/lib/imdb.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/imdb.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -357,8 +357,6 @@
};
-// $Log: not supported by cvs2svn $
-
// (c-file-style: "gnu")
// Local Variables:
// mode: php
@@ -367,4 +365,4 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/plugin/CacheTest.php
===================================================================
--- trunk/lib/plugin/CacheTest.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/plugin/CacheTest.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -150,8 +150,6 @@
} // WikiPlugin_CacheTest
-// $Log: not supported by cvs2svn $
-
// For emacs users
// Local Variables:
// mode: php
Modified: trunk/lib/plugin/CreateBib.php
===================================================================
--- trunk/lib/plugin/CreateBib.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/plugin/CreateBib.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -168,7 +168,6 @@
}
};
-// $Log: not supported by cvs2svn $
// Based on CreateTOC
// For emacs users
Modified: trunk/lib/plugin/Imdb.php
===================================================================
--- trunk/lib/plugin/Imdb.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/plugin/Imdb.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -110,9 +110,6 @@
}
};
-// $Log: not supported by cvs2svn $
-//
-
// For emacs users
// Local Variables:
// mode: php
Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/plugin/LinkSearch.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -180,9 +180,6 @@
}
}
-// $Log: not supported by cvs2svn $
-//
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/NewPagesPerUser.php
===================================================================
--- trunk/lib/plugin/NewPagesPerUser.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/plugin/NewPagesPerUser.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -116,12 +116,6 @@
}
};
-//function cmp_by_num($a, $b) { // larger first
-// return $a < $b ? 1 : 0;
-//}
-
-// $Log: not supported by cvs2svn $
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/plugin/RecentEdits.php
===================================================================
--- trunk/lib/plugin/RecentEdits.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/plugin/RecentEdits.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -42,8 +42,6 @@
}
}
-// $Log: not supported by cvs2svn $
-
// (c-file-style: "gnu")
// Local Variables:
// mode: php
Modified: trunk/lib/plugin/UriResolver.php
===================================================================
--- trunk/lib/plugin/UriResolver.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/plugin/UriResolver.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -65,8 +65,6 @@
}
};
-// $Log: not supported by cvs2svn $
-
// For emacs users
// Local Variables:
// mode: php
Modified: trunk/lib/plugin/_Retransform.php
===================================================================
--- trunk/lib/plugin/_Retransform.php 2009-09-10 16:24:18 UTC (rev 7109)
+++ trunk/lib/plugin/_Retransform.php 2009-09-11 08:04:02 UTC (rev 7110)
@@ -85,8 +85,6 @@
};
-// $Log: not supported by cvs2svn $
-
// (c-file-style: "gnu")
// Local Variables:
// mode: php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-10 16:24:35
|
Revision: 7109
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7109&view=rev
Author: vargenau
Date: 2009-09-10 16:24:18 +0000 (Thu, 10 Sep 2009)
Log Message:
-----------
Remove history
Modified Paths:
--------------
trunk/lib/wikilens/CustomPrefs.php
Modified: trunk/lib/wikilens/CustomPrefs.php
===================================================================
--- trunk/lib/wikilens/CustomPrefs.php 2009-09-10 16:08:56 UTC (rev 7108)
+++ trunk/lib/wikilens/CustomPrefs.php 2009-09-10 16:24:18 UTC (rev 7109)
@@ -53,9 +53,6 @@
'recnnbr' => new _UserPreference_recnnbr(10,14,80),
));
-
-// $Log: not supported by cvs2svn $
-
// Local Variables:
// mode: php
// tab-width: 8
@@ -63,4 +60,4 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-10 16:09:07
|
Revision: 7108
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7108&view=rev
Author: vargenau
Date: 2009-09-10 16:08:56 +0000 (Thu, 10 Sep 2009)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
trunk/lib/WikiUserNew.php
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php 2009-09-10 14:54:37 UTC (rev 7107)
+++ trunk/lib/WikiUserNew.php 2009-09-10 16:08:56 UTC (rev 7108)
@@ -1171,9 +1171,9 @@
function getPreferences() {
if (!empty($this->_prefs->_method)) {
if ($this->_prefs->_method == 'ADODB') {
- // FIXME: strange why this should be needed...
- include_once("lib/WikiUser/Db.php");
- include_once("lib/WikiUser/AdoDb.php");
+ // FIXME: strange why this should be needed...
+ include_once("lib/WikiUser/Db.php");
+ include_once("lib/WikiUser/AdoDb.php");
if (check_php_version(5)) {
$user = new _AdoDbPassUser($this->_userid, $this->_prefs);
return $user->getPreferences();
@@ -1182,8 +1182,8 @@
return _AdoDbPassUser::getPreferences();
}
} elseif ($this->_prefs->_method == 'SQL') {
- include_once("lib/WikiUser/Db.php");
- include_once("lib/WikiUser/PearDb.php");
+ include_once("lib/WikiUser/Db.php");
+ include_once("lib/WikiUser/PearDb.php");
if (check_php_version(5)) {
$user = new _PearDbPassUser($this->_userid, $this->_prefs);
return $user->getPreferences();
@@ -1192,8 +1192,8 @@
return _PearDbPassUser::getPreferences();
}
} elseif ($this->_prefs->_method == 'PDO') {
- include_once("lib/WikiUser/Db.php");
- include_once("lib/WikiUser/PdoDb.php");
+ include_once("lib/WikiUser/Db.php");
+ include_once("lib/WikiUser/PdoDb.php");
if (check_php_version(5)) {
$user = new _PdoDbPassUser($this->_userid, $this->_prefs);
return $user->getPreferences();
@@ -1224,9 +1224,9 @@
function setPreferences($prefs, $id_only=false) {
if (!empty($this->_prefs->_method)) {
if ($this->_prefs->_method == 'ADODB') {
- // FIXME: strange why this should be needed...
- include_once("lib/WikiUser/Db.php");
- include_once("lib/WikiUser/AdoDb.php");
+ // FIXME: strange why this should be needed...
+ include_once("lib/WikiUser/Db.php");
+ include_once("lib/WikiUser/AdoDb.php");
if (check_php_version(5)) {
$user = new _AdoDbPassUser($this->_userid, $prefs);
return $user->setPreferences($prefs, $id_only);
@@ -1236,8 +1236,8 @@
}
}
elseif ($this->_prefs->_method == 'SQL') {
- include_once("lib/WikiUser/Db.php");
- include_once("lib/WikiUser/PearDb.php");
+ include_once("lib/WikiUser/Db.php");
+ include_once("lib/WikiUser/PearDb.php");
if (check_php_version(5)) {
$user = new _PearDbPassUser($this->_userid, $prefs);
return $user->setPreferences($prefs, $id_only);
@@ -1247,8 +1247,8 @@
}
}
elseif ($this->_prefs->_method == 'PDO') {
- include_once("lib/WikiUser/Db.php");
- include_once("lib/WikiUser/PdoDb.php");
+ include_once("lib/WikiUser/Db.php");
+ include_once("lib/WikiUser/PdoDb.php");
if (check_php_version(5)) {
$user = new _PdoDbPassUser($this->_userid, $prefs);
return $user->setPreferences($prefs, $id_only);
@@ -2112,9 +2112,9 @@
if (!is_array($packed)) return false;
$prefs = array();
foreach ($packed as $name => $packed_pref) {
- if (is_string($packed_pref)
- and isSerialized($packed_pref)
- and substr($packed_pref, 0, 2) == "O:")
+ if (is_string($packed_pref)
+ and isSerialized($packed_pref)
+ and substr($packed_pref, 0, 2) == "O:")
{
//legacy: check if it's an old array of objects
// Looks like a serialized object.
@@ -2130,7 +2130,7 @@
$prefs[$name] = $value;
}
} else {
- if (isSerialized($packed_pref))
+ if (isSerialized($packed_pref))
$prefs[$name] = @unserialize($packed_pref);
if (empty($prefs[$name]) and isSerialized(base64_decode($packed_pref)))
$prefs[$name] = @unserialize(base64_decode($packed_pref));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-10 14:54:45
|
Revision: 7107
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7107&view=rev
Author: vargenau
Date: 2009-09-10 14:54:37 +0000 (Thu, 10 Sep 2009)
Log Message:
-----------
Avoid warning
Modified Paths:
--------------
trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2009-09-10 14:47:09 UTC (rev 7106)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2009-09-10 14:54:37 UTC (rev 7107)
@@ -695,7 +695,7 @@
} else if ($type == OCI_B_BLOB){
//we have to create a new Descriptor here
$_blob = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
- $rez = OCIBindByName($stmt[1], ":".$name, &$_blob, -1, OCI_B_BLOB);
+ $rez = OCIBindByName($stmt[1], ":".$name, $_blob, -1, OCI_B_BLOB);
$rez = $_blob;
} else {
if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php 2009-09-10 14:47:09 UTC (rev 7106)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php 2009-09-10 14:54:37 UTC (rev 7107)
@@ -244,11 +244,10 @@
}
function _fetch($ignore_fields=false) {
-// should remove call by reference, but ora_fetch_into requires it in 4.0.3pl1
if ($this->fetchMode & ADODB_FETCH_ASSOC)
- return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
+ return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
else
- return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS);
+ return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS);
}
/* close() only needs to be called if you are worried about using too much memory while your script
@@ -295,4 +294,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-10 14:47:31
|
Revision: 7106
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7106&view=rev
Author: vargenau
Date: 2009-09-10 14:47:09 +0000 (Thu, 10 Sep 2009)
Log Message:
-----------
Avoid warning
Modified Paths:
--------------
trunk/tests/xmlrpc/interop-client.php
trunk/tests/xmlrpc/xmlrpc-introspect.php
Modified: trunk/tests/xmlrpc/interop-client.php
===================================================================
--- trunk/tests/xmlrpc/interop-client.php 2009-09-10 14:41:11 UTC (rev 7105)
+++ trunk/tests/xmlrpc/interop-client.php 2009-09-10 14:47:09 UTC (rev 7106)
@@ -171,11 +171,11 @@
));
$foo = "some base64 string";
- xmlrpc_set_type(&$foo, "base64");
+ xmlrpc_set_type($foo, "base64");
run_test($server, $debug, $output, "interopEchoTests.echoBase64", $foo);
$foo="19980717T14:08:55";
- xmlrpc_set_type(&$foo, "datetime");
+ xmlrpc_set_type($foo, "datetime");
run_test($server, $debug, $output, "interopEchoTests.echoDate", $foo);
run_no_param_test($server, $debug, $output, "interopEchoTests.noInParams");
@@ -306,4 +306,4 @@
contains three elements: varString, varInt, and varFloat, a string, an integer, and a floating point number,
respectively.
- */
\ No newline at end of file
+ */
Modified: trunk/tests/xmlrpc/xmlrpc-introspect.php
===================================================================
--- trunk/tests/xmlrpc/xmlrpc-introspect.php 2009-09-10 14:41:11 UTC (rev 7105)
+++ trunk/tests/xmlrpc/xmlrpc-introspect.php 2009-09-10 14:47:09 UTC (rev 7106)
@@ -17,8 +17,8 @@
$typeList = $response[typeList];
$methodList = $response[methodList];
- usort(&$typeList, "name_cmp");
- usort(&$methodList, "name_cmp");
+ usort($typeList, "name_cmp");
+ usort($methodList, "name_cmp");
if ($methodList) {
$buf .= "<big>Methods\n<ul>";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-10 14:41:23
|
Revision: 7105
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7105&view=rev
Author: vargenau
Date: 2009-09-10 14:41:11 +0000 (Thu, 10 Sep 2009)
Log Message:
-----------
Avoid warning
Modified Paths:
--------------
trunk/themes/gforge/themeinfo.php
Modified: trunk/themes/gforge/themeinfo.php
===================================================================
--- trunk/themes/gforge/themeinfo.php 2009-09-09 14:00:22 UTC (rev 7104)
+++ trunk/themes/gforge/themeinfo.php 2009-09-10 14:41:11 UTC (rev 7105)
@@ -51,7 +51,7 @@
function footer() {
global $HTML;
- $HTML->footer();
+ $HTML->footer(array());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-09 14:00:42
|
Revision: 7104
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7104&view=rev
Author: vargenau
Date: 2009-09-09 14:00:22 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
Revision 7383 from Fusionforge
Revision Links:
--------------
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7383&view=rev
Modified Paths:
--------------
trunk/lib/WikiUser/PearDb.php
trunk/tests/xmlrpc/interop-client.php
Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php 2009-09-09 13:15:16 UTC (rev 7103)
+++ trunk/lib/WikiUser/PearDb.php 2009-09-09 14:00:22 UTC (rev 7104)
@@ -51,7 +51,7 @@
return $this->_prefs;
}
}
- if ($this->_HomePagehandle) {
+ if (isset($this->_HomePagehandle)) {
if ($restored_from_page = $this->_prefs->retrieve
($this->_HomePagehandle->get('pref'))) {
$updated = $this->_prefs->updatePrefs($restored_from_page);
Modified: trunk/tests/xmlrpc/interop-client.php
===================================================================
--- trunk/tests/xmlrpc/interop-client.php 2009-09-09 13:15:16 UTC (rev 7103)
+++ trunk/tests/xmlrpc/interop-client.php 2009-09-09 14:00:22 UTC (rev 7104)
@@ -214,7 +214,7 @@
"varInt" => 186000,
"varString" => "18 > 2 && 2 < 18 && 42 == the answer to life, the universe, and everything" ));
run_test($server, $debug, $output, "interopEchoTests.echoStringArray",
- array($decl_1, $decl_2, $decl_3, $decl_4, "non-ascii chars above 127 (165-170): \xA5, \xA6, \xA7, \xA8, \xA9, \xAA"));
+ array($decl_1, $decl_2, $decl_3, $decl_4, "non-ascii chars above 127 (165-170): ¥, ¦, §, ¨, ©, ª"));
run_test($server, $debug, $output, "interopEchoTests.echoIntegerArray",
array(23, 234, 1, 0, -10, 999));
run_test($server, $debug, $output, "interopEchoTests.echoFloatArray",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-09 13:15:25
|
Revision: 7103
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7103&view=rev
Author: vargenau
Date: 2009-09-09 13:15:16 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
define('ENABLE_AJAX', false);
Modified Paths:
--------------
trunk/g
Modified: trunk/g
===================================================================
--- trunk/g 2009-09-09 13:11:38 UTC (rev 7102)
+++ trunk/g 2009-09-09 13:15:16 UTC (rev 7103)
@@ -122,6 +122,7 @@
// Disable ENABLE_ACDROPDOWN, it creates a <style> in the <body> (illegal)
define('ENABLE_ACDROPDOWN', false);
+ define('ENABLE_AJAX', false);
define('TOOLBAR_PAGELINK_PULLDOWN', false);
define('TOOLBAR_TEMPLATE_PULLDOWN', false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-09 13:11:54
|
Revision: 7102
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7102&view=rev
Author: vargenau
Date: 2009-09-09 13:11:38 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
dos2unix
Modified Paths:
--------------
trunk/uploads/index.php
Modified: trunk/uploads/index.php
===================================================================
--- trunk/uploads/index.php 2009-09-09 12:36:06 UTC (rev 7101)
+++ trunk/uploads/index.php 2009-09-09 13:11:38 UTC (rev 7102)
@@ -1,4 +1,4 @@
-<?php // $Id$
- header( "Location: ../index.php?pagename=UpLoad" );
- exit();
-?>
\ No newline at end of file
+<?php // $Id$
+ header( "Location: ../index.php?pagename=UpLoad" );
+ exit();
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-09 12:36:18
|
Revision: 7101
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7101&view=rev
Author: vargenau
Date: 2009-09-09 12:36:06 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
dos2unix
Modified Paths:
--------------
trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php 2009-09-05 17:12:17 UTC (rev 7100)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php 2009-09-09 12:36:06 UTC (rev 7101)
@@ -1,218 +1,218 @@
-<?php
-
-$symbol_arr = array(
-
-// Greek symbols
-'alpha' => array( 'input'=>'alpha','tag'=>'mi', 'output'=>'&#' . hexdec('03B1') . ';'),
-'beta' => array( 'input'=>'beta','tag'=>'mi', 'output'=>'&#' . hexdec('03B2') . ';'),
-'chi' => array( 'input'=>'chi','tag'=>'mi', 'output'=>'&#' . hexdec('03C7') . ';'),
-'delta' => array( 'input'=>'delta','tag'=>'mi', 'output'=>'&#' . hexdec('03B4') . ';'),
-'Delta' => array( 'input'=>'Delta','tag'=>'mo', 'output'=>'&#' . hexdec('0394') . ';'),
-'epsi' => array( 'input'=>'epsi','tag'=>'mi', 'output'=>'&#' . hexdec('03B5') . ';'),
-'varepsilon' => array( 'input'=>'varepsilon','tag'=>'mi', 'output'=>'&#' . hexdec('025B') . ';'),
-'eta' => array( 'input'=>'eta','tag'=>'mi', 'output'=>'&#' . hexdec('03B7') . ';'),
-'gamma' => array( 'input'=>'gamma','tag'=>'mi', 'output'=>'&#' . hexdec('03B3') . ';'),
-'Gamma' => array( 'input'=>'Gamma','tag'=>'mi', 'output'=>'&#' . hexdec('0393') . ';'),
-'iota' => array( 'input'=>'iota','tag'=>'mi', 'output'=>'&#' . hexdec('03B9') . ';'),
-'kappa' => array( 'input'=>'kappa','tag'=>'mi', 'output'=>'&#' . hexdec('03BA') . ';'),
-'lambda' => array( 'input'=>'lambda','tag'=>'mi', 'output'=>'&#' . hexdec('03BB') . ';'),
-'Lambda' => array( 'input'=>'Lambda','tag'=>'mo', 'output'=>'&#' . hexdec('039B') . ';'),
-'mu' => array( 'input'=>'mu','tag'=>'mi', 'output'=>'&#' . hexdec('03BC') . ';'),
-'nu' => array( 'input'=>'nu','tag'=>'mi', 'output'=>'&#' . hexdec('03BD') . ';'),
-'omega' => array( 'input'=>'omega','tag'=>'mi', 'output'=>'&#' . hexdec('03C9') . ';'),
-'Omega' => array( 'input'=>'Omega','tag'=>'mo', 'output'=>'&#' . hexdec('03A9') . ';'),
-'phi' => array( 'input'=>'phi','tag'=>'mi', 'output'=>'&#' . hexdec('03C6') . ';'),
-'varphi' => array( 'input'=>'varphi','tag'=>'mi', 'output'=>'&#' . hexdec('03D5') . ';'),
-'Phi' => array( 'input'=>'Phi','tag'=>'mo', 'output'=>'&#' . hexdec('03A6') . ';'),
-'pi' => array( 'input'=>'pi','tag'=>'mi', 'output'=>'&#' . hexdec('03C0') . ';'),
-'Pi' => array( 'input'=>'Pi','tag'=>'mo', 'output'=>'&#' . hexdec('03A0') . ';'),
-'psi' => array( 'input'=>'psi','tag'=>'mi', 'output'=>'&#' . hexdec('03C8') . ';'),
-'rho' => array( 'input'=>'rho','tag'=>'mi', 'output'=>'&#' . hexdec('03C1') . ';'),
-'sigma' => array( 'input'=>'sigma','tag'=>'mi', 'output'=>'&#' . hexdec('03C3') . ';'),
-'Sigma' => array( 'input'=>'Sigma','tag'=>'mo', 'output'=>'&#' . hexdec('03A3') . ';'),
-'tau' => array( 'input'=>'tau','tag'=>'mi', 'output'=>'&#' . hexdec('03C4') . ';'),
-'theta' => array( 'input'=>'theta','tag'=>'mi', 'output'=>'&#' . hexdec('03B8') . ';'),
-'vartheta' => array( 'input'=>'vartheta','tag'=>'mi', 'output'=>'&#' . hexdec('03D1') . ';'),
-'Theta' => array( 'input'=>'Theta','tag'=>'mo', 'output'=>'&#' . hexdec('0398') . ';'),
-'upsilon' => array( 'input'=>'upsilon','tag'=>'mi', 'output'=>'&#' . hexdec('03C5') . ';'),
-'xi' => array( 'input'=>'xi','tag'=>'mi', 'output'=>'&#' . hexdec('03BE') . ';'),
-'Xi' => array( 'input'=>'alpha','tag'=>'mo', 'output'=>'&#' . hexdec('039E') . ';'),
-'zeta' => array( 'input'=>'zeta','tag'=>'mi', 'output'=>'&#' . hexdec('03B6') . ';'),
-
-// Binary operation symbols
-'*' => array( 'input'=>'*','tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';'),
-'**' => array( 'input'=>'**','tag'=>'mo', 'output'=>'&#' . hexdec('22C6') . ';'),
-'//' => array( 'input'=>'//','tag'=>'mo', 'output'=>'/'),
-'\\\\' => array( 'input'=>'\\\\','tag'=>'mo', 'output'=>'\\'),
-'xx' => array( 'input'=>'xx','tag'=>'mo', 'output'=>'&#' . hexdec('00D7') . ';'),
-'-:' => array( 'input'=>'-:','tag'=>'mo', 'output'=>'&#' . hexdec('00F7') . ';'),
-'@' => array( 'input'=>'@','tag'=>'mo', 'output'=>'&#' . hexdec('2218') . ';'),
-'o+' => array( 'input'=>'o+','tag'=>'mo', 'output'=>'&#' . hexdec('2295') . ';'),
-'ox' => array( 'input'=>'ox','tag'=>'mo', 'output'=>'&#' . hexdec('2297') . ';'),
-'sum' => array( 'input'=>'sum','tag'=>'mo', 'output'=>'&#' . hexdec('2211') . ';', 'underover'=>TRUE),
-'prod' => array( 'input'=>'prod','tag'=>'mo', 'output'=>'&#' . hexdec('220F') . ';', 'underover'=>TRUE),
-'^^' => array( 'input'=>'^^','tag'=>'mo', 'output'=>'&#' . hexdec('2227') . ';'),
-'^^^' => array( 'input'=>'^^^','tag'=>'mo', 'output'=>'&#' . hexdec('22C0') . ';', 'underover'=>TRUE),
-'vv' => array( 'input'=>'vv','tag'=>'mo', 'output'=>'&#' . hexdec('2228') . ';'),
-'vvv' => array( 'input'=>'vvv','tag'=>'mo', 'output'=>'&#' . hexdec('22C1') . ';', 'underover'=>TRUE),
-'nn' => array( 'input'=>'nn','tag'=>'mo', 'output'=>'&#' . hexdec('2229') . ';'),
-'nnn' => array( 'input'=>'nnn','tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';', 'underover'=>TRUE),
-'uu' => array( 'input'=>'uu','tag'=>'mo', 'output'=>'&#' . hexdec('222A') . ';'),
-'uuu' => array( 'input'=>'uuu','tag'=>'mo', 'output'=>'&#' . hexdec('22C3') . ';', 'underover'=>TRUE),
-
-// Binary relation symbols
-'!=' => array( 'input'=>'!=','tag'=>'mo', 'output'=>'&#' . hexdec('2260') . ';'),
-':=' => array( 'input'=>':=','tag'=>'mo', 'output'=>':=' ), /* 2005-06-05 wes */
-'<' => array( 'input'=>'<','tag'=>'mo', 'output'=>'<'),
-'lt' => array( 'input'=>'lt','tag'=>'mo', 'output'=>'<'), /* 2005-06-05 wes */
-'<=' => array( 'input'=>'<=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
-'lt=' => array( 'input'=>'lt=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
-'le' => array( 'input'=>'le','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), /* 2005-06-05 wes */
-'>' => array( 'input'=>'>','tag'=>'mo', 'output'=>'>'),
-'>=' => array( 'input'=>'>=','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
-'qeq' => array( 'input'=>'geq','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
-'-<' => array( 'input'=>'-<','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
-'-lt' => array( 'input'=>'-lt','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
-'>-' => array( 'input'=>'>-','tag'=>'mo', 'output'=>'&#' . hexdec('227B') . ';'),
-'in' => array( 'input'=>'in','tag'=>'mo', 'output'=>'&#' . hexdec('2208') . ';'),
-'!in' => array( 'input'=>'!in','tag'=>'mo', 'output'=>'&#' . hexdec('2209') . ';'),
-'sub' => array( 'input'=>'sub','tag'=>'mo', 'output'=>'&#' . hexdec('2282') . ';'),
-'sup' => array( 'input'=>'sup','tag'=>'mo', 'output'=>'&#' . hexdec('2283') . ';'),
-'sube' => array( 'input'=>'sube','tag'=>'mo', 'output'=>'&#' . hexdec('2286') . ';'),
-'supe' => array( 'input'=>'supe','tag'=>'mo', 'output'=>'&#' . hexdec('2287') . ';'),
-'-=' => array( 'input'=>'-=','tag'=>'mo', 'output'=>'&#' . hexdec('2261') . ';'),
-'~=' => array( 'input'=>'~=','tag'=>'mo', 'output'=>'&#' . hexdec('2245') . ';'),
-'~~' => array( 'input'=>'~~','tag'=>'mo', 'output'=>'&#' . hexdec('2248') . ';'),
-'prop' => array( 'input'=>'prop','tag'=>'mo', 'output'=>'&#' . hexdec('221D') . ';'),
-
-// Logical symbols
-'and' => array( 'input'=>'and','tag'=>'mtext', 'output'=>'and', 'space'=>'1ex'),
-'or' => array( 'input'=>'or','tag'=>'mtext', 'output'=>'or', 'space'=>'1ex'),
-'not' => array( 'input'=>'not','tag'=>'mo', 'output'=>'&#' . hexdec('00AC') . ';'),
-'=>' => array( 'input'=>'=>','tag'=>'mo', 'output'=>'&#' . hexdec('21D2') . ';'),
-'if' => array( 'input'=>'if','tag'=>'mo', 'output'=>'if', 'space'=>'1ex'),
-'iff' => array( 'input'=>'iff','tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'),
-'<=>' => array( 'input'=>'iff','tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'), /* 2005-06-07 wes */
-'AA' => array( 'input'=>'AA','tag'=>'mo', 'output'=>'&#' . hexdec('2200') . ';'),
-'EE' => array( 'input'=>'EE','tag'=>'mo', 'output'=>'&#' . hexdec('2203') . ';'),
-'_|_' => array( 'input'=>'_|_','tag'=>'mo', 'output'=>'&#' . hexdec('22A5') . ';'),
-'TT' => array( 'input'=>'TT','tag'=>'mo', 'output'=>'&#' . hexdec('22A4') . ';'),
-'|-' => array( 'input'=>'|-','tag'=>'mo', 'output'=>'&#' . hexdec('22A2') . ';'),
-'|=' => array( 'input'=>'|=','tag'=>'mo', 'output'=>'&#' . hexdec('22A8') . ';'),
-
-// Miscellaneous symbols
-'ang' => array('input'=>'ang','tag'=>'mo','output'=>'&#' . hexdec('2220') . ';'),
-'deg' => array('input'=>'deg','tag'=>'mo','output'=>'&#' . hexdec('00B0') . ';'),
-'int' => array( 'input'=>'int','tag'=>'mo', 'output'=>'&#' . hexdec('222B') . ';'),
-'dx' => array( 'input'=>'dx','tag'=>'mi', 'output'=>'{:d x:}', 'definition'=>TRUE), /* 2005-06-11 wes */
-'dy' => array( 'input'=>'dy','tag'=>'mi', 'output'=>'{:d y:}', 'definition'=>TRUE), /* 2005-06-11 wes */
-'dz' => array( 'input'=>'dz','tag'=>'mi', 'output'=>'{:d z:}', 'definition'=>TRUE), /* 2005-06-11 wes */
-'dt' => array( 'input'=>'dt','tag'=>'mi', 'output'=>'{:d t:}', 'definition'=>TRUE), /* 2005-06-11 wes */
-'oint' => array( 'input'=>'oint','tag'=>'mo', 'output'=>'&#' . hexdec('222E') . ';'),
-'del' => array( 'input'=>'del','tag'=>'mo', 'output'=>'&#' . hexdec('2202') . ';'),
-'grad' => array( 'input'=>'grad','tag'=>'mo', 'output'=>'&#' . hexdec('2207') . ';'),
-'+-' => array( 'input'=>'+-','tag'=>'mo', 'output'=>'&#' . hexdec('00B1') . ';'),
-'O/' => array( 'input'=>'0/','tag'=>'mo', 'output'=>'&#' . hexdec('2205') . ';'),
-'oo' => array( 'input'=>'oo','tag'=>'mo', 'output'=>'&#' . hexdec('221E') . ';'),
-'aleph' => array( 'input'=>'aleph','tag'=>'mo', 'output'=>'&#' . hexdec('2135') . ';'),
-'...' => array( 'input'=>'int','tag'=>'mo', 'output'=>'...'),
-'~' => array( 'input'=>'!~','tag'=>'mo', 'output'=>'&#' . hexdec('0020') . ';'),
-'\\ ' => array( 'input'=>'~','tag'=>'mo', 'output'=>'&#' . hexdec('00A0') . ';'),
-'quad' => array( 'input'=>'quad','tag'=>'mo', 'output'=>'&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';'),
-'qquad' => array( 'input'=>'qquad','tag'=>'mo', 'output'=> '&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';'),
-'cdots' => array( 'input'=>'cdots','tag'=>'mo', 'output'=>'&#' . hexdec('22EF') . ';'),
-'vdots' => array( 'input'=>'vdots','tag'=>'mo', 'output'=>'&#' . hexdec('22EE') . ';'), /* 2005-06-11 wes */
-'ddots' => array( 'input'=>'ddots','tag'=>'mo', 'output'=>'&#' . hexdec('22F1') . ';'), /* 2005-06-11 wes */
-'diamond' => array( 'input'=>'diamond','tag'=>'mo', 'output'=>'&#' . hexdec('22C4') . ';'),
-'square' => array( 'input'=>'square','tag'=>'mo', 'output'=>'&#' . hexdec('25A1') . ';'),
-'|_' => array( 'input'=>'|_','tag'=>'mo', 'output'=>'&#' . hexdec('230A') . ';'),
-'_|' => array( 'input'=>'_|','tag'=>'mo', 'output'=>'&#' . hexdec('230B') . ';'),
-'|~' => array( 'input'=>'|~','tag'=>'mo', 'output'=>'&#' . hexdec('2308') . ';'),
-'~|' => array( 'input'=>'~|','tag'=>'mo', 'output'=>'&#' . hexdec('2309') . ';'),
-'CC' => array( 'input'=>'CC','tag'=>'mo', 'output'=>'&#' . hexdec('2102') . ';'),
-'NN' => array( 'input'=>'NN','tag'=>'mo', 'output'=>'&#' . hexdec('2115') . ';'),
-'QQ' => array( 'input'=>'QQ','tag'=>'mo', 'output'=>'&#' . hexdec('211A') . ';'),
-'RR' => array( 'input'=>'RR','tag'=>'mo', 'output'=>'&#' . hexdec('211D') . ';'),
-'ZZ' => array( 'input'=>'ZZ','tag'=>'mo', 'output'=>'&#' . hexdec('2124') . ';'),
-
-// Standard functions
-'lim' => array( 'input'=>'lim','tag'=>'mo', 'output'=>'lim', 'underover'=>TRUE),
-'Lim' => array( 'input'=>'Lim','tag'=>'mo', 'output'=>'Lim', 'underover'=>TRUE), /* 2005-06-11 wes */
-'sin' => array( 'input'=>'sin','tag'=>'mo', 'output'=>'sin', 'unary'=>TRUE, 'func'=>TRUE),
-'cos' => array( 'input'=>'cos', 'tag'=>'mo', 'output'=>'cos', 'unary'=>TRUE, 'func'=>TRUE),
-'tan' => array( 'input'=>'tan', 'tag'=>'mo', 'output'=>'tan', 'unary'=>TRUE, 'func'=>TRUE),
-'arcsin' => array( 'input'=>'arcsin','tag'=>'mo', 'output'=>'arcsin', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-'arccos' => array( 'input'=>'arccos', 'tag'=>'mo', 'output'=>'arccos', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-'arctan' => array( 'input'=>'arctan', 'tag'=>'mo', 'output'=>'arctan', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-'sinh' => array( 'input'=>'sinh','tag'=>'mo', 'output'=>'sinh', 'unary'=>TRUE, 'func'=>TRUE),
-'cosh' => array( 'input'=>'cosh', 'tag'=>'mo', 'output'=>'cosh', 'unary'=>TRUE, 'func'=>TRUE),
-'tanh' => array( 'input'=>'tanh', 'tag'=>'mo', 'output'=>'tanh', 'unary'=>TRUE, 'func'=>TRUE),
-'cot' => array( 'input'=>'cot','tag'=>'mo', 'output'=>'cot', 'unary'=>TRUE, 'func'=>TRUE),
-'sec' => array( 'input'=>'sec', 'tag'=>'mo', 'output'=>'sec', 'unary'=>TRUE, 'func'=>TRUE),
-'csc' => array( 'input'=>'csc', 'tag'=>'mo', 'output'=>'csc', 'unary'=>TRUE, 'func'=>TRUE),
-'coth' => array( 'input'=>'coth','tag'=>'mo', 'output'=>'coth', 'unary'=>TRUE, 'func'=>TRUE),
-'sech' => array( 'input'=>'sech', 'tag'=>'mo', 'output'=>'sech', 'unary'=>TRUE, 'func'=>TRUE),
-'csch' => array( 'input'=>'csch', 'tag'=>'mo', 'output'=>'csch', 'unary'=>TRUE, 'func'=>TRUE),
-'log' => array( 'input'=>'log', 'tag'=>'mo', 'output'=>'log', 'unary'=>TRUE, 'func'=>TRUE),
-'ln' => array( 'input'=>'ln', 'tag'=>'mo', 'output'=>'ln', 'unary'=>TRUE, 'func'=>TRUE),
-'det' => array( 'input'=>'det', 'tag'=>'mo', 'output'=>'det', 'unary'=>TRUE, 'func'=>TRUE),
-'dim' => array( 'input'=>'dim', 'tag'=>'mo', 'output'=>'dim'),
-'mod' => array( 'input'=>'mod', 'tag'=>'mo', 'output'=>'mod'),
-'gcd' => array( 'input'=>'gcd', 'tag'=>'mo', 'output'=>'gcd', 'unary'=>TRUE, 'func'=>TRUE),
-'lcm' => array( 'input'=>'lcm', 'tag'=>'mo', 'output'=>'lcm', 'unary'=>TRUE, 'func'=>TRUE),
-'lub' => array( 'input'=>'lub', 'tag'=>'mo', 'output'=>'lub'), /* 2005-06-11 wes */
-'glb' => array( 'input'=>'glb', 'tag'=>'mo', 'output'=>'glb'), /* 2005-06-11 wes */
-'min' => array( 'input'=>'min', 'tag'=>'mo', 'output'=>'min', 'underover'=>TRUE), /* 2005-06-11 wes */
-'max' => array( 'input'=>'max', 'tag'=>'mo', 'output'=>'max', 'underover'=>TRUE), /* 2005-06-11 wes */
-'f' => array( 'input'=>'f','tag'=>'mi', 'output'=>'f', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-'g' => array( 'input'=>'g', 'tag'=>'mi', 'output'=>'g', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
-
-// Arrows
-'uarr' => array( 'input'=>'uarr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2191') . ';'),
-'darr' => array( 'input'=>'darr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2193') . ';'),
-'rarr' => array( 'input'=>'rarr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2192') . ';'),
-'->' => array( 'input'=>'->', 'tag'=>'mo', 'output'=>'&#' . hexdec('2192') . ';'),
-'|->' => array( 'input'=>'|->', 'tag'=>'mo', 'output'=>'&#' . hexdec('21A6') . ';'), /* 2005-06-11 wes */
-'larr' => array( 'input'=>'larr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2190') . ';'),
-'harr' => array( 'input'=>'harr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2194') . ';'),
-'rArr' => array( 'input'=>'rArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D2') . ';'),
-'lArr' => array( 'input'=>'lArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D0') . ';'),
-'hArr' => array( 'input'=>'hArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'),
-
-// Commands with argument
-'sqrt' => array( 'input'=>'sqrt', 'tag'=>'msqrt', 'output'=>'sqrt', 'unary'=>TRUE ),
-'root' => array( 'input'=>'root', 'tag'=>'mroot', 'output'=>'root', 'binary'=>TRUE ),
-'frac' => array( 'input'=>'frac', 'tag'=>'mfrac', 'output'=>'/', 'binary'=>TRUE),
-'/' => array( 'input'=>'/', 'tag'=>'mfrac', 'output'=>'/', 'infix'=>TRUE),
-'_' => array( 'input'=>'_', 'tag'=>'msub', 'output'=>'_', 'infix'=>TRUE),
-'^' => array( 'input'=>'^', 'tag'=>'msup', 'output'=>'^', 'infix'=>TRUE),
-'hat' => array( 'input'=>'hat', 'tag'=>'mover', 'output'=>'&#' . hexdec('005E') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
-'bar' => array( 'input'=>'bar', 'tag'=>'mover', 'output'=>'&#' . hexdec('00AF') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
-'vec' => array( 'input'=>'vec', 'tag'=>'mover', 'output'=>'&#' . hexdec('2192') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
-'dot' => array( 'input'=>'dot', 'tag'=>'mover', 'output'=>'.', 'unary'=>TRUE, 'acc'=>TRUE),
-'ddot' => array( 'input'=>'ddot', 'tag'=>'mover', 'output'=>'..', 'unary'=>TRUE, 'acc'=>TRUE),
-'ul' => array( 'input'=>'ul', 'tag'=>'munder', 'output'=>'&#' . hexdec('0332') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
-'avec' => array( 'input'=>'avec', 'tag'=>'munder', 'output'=>'~', 'unary'=>TRUE, 'acc'=>TRUE),
-'text' => array( 'input'=>'text', 'tag'=>'mtext', 'output'=>'text', 'unary'=>TRUE),
-'mbox' => array( 'input'=>'mbox', 'tag'=>'mtext', 'output'=>'mbox', 'unary'=>TRUE),
-'"' => array( 'input'=>'"', 'tag'=>'mtext','output'=>'mbox', 'unary'=>TRUE),
-
-/* 2005-06-05 wes: added stackrel */
-'stackrel' => array( 'input'=>'stackrel', 'tag'=>'mover', 'output'=>'stackrel', 'binary'=>TRUE),
-
-// Grouping brackets
-'(' => array( 'input'=>'(', 'tag'=>'mo', 'output'=>'(', 'left_bracket'=>TRUE),
-')' => array( 'input'=>')', 'tag'=>'mo', 'output'=>')', 'right_bracket'=>TRUE),
-'[' => array( 'input'=>'[', 'tag'=>'mo', 'output'=>'[', 'left_bracket'=>TRUE),
-']' => array( 'input'=>']', 'tag'=>'mo', 'output'=>']', 'right_bracket'=>TRUE),
-'{' => array( 'input'=>'{', 'tag'=>'mo', 'output'=>'{', 'left_bracket'=>TRUE),
-'}' => array( 'input'=>'}', 'tag'=>'mo', 'output'=>'}', 'right_bracket'=>TRUE),
-'(:' => array( 'input'=>'(:', 'tag'=>'mo', 'output'=>'&#' . hexdec('2329') . ';', 'left_bracket'=>TRUE),
-':)' => array( 'input'=>':)', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE),
-'{:' => array( 'input'=>'{:', 'tag'=>'mo', 'output'=>'{:', 'left_bracket'=>TRUE, 'invisible'=>TRUE),
-':}' => array( 'input'=>':}', 'tag'=>'mo', 'output'=>':}', 'right_bracket'=>TRUE ,'invisible'=>TRUE),
-'<<' => array( 'input'=>'<<', 'tag'=>'mo', 'output'=>'&#' . hexdec('2329') . ';', 'left_bracket'=>TRUE), // 2005-06-07 wes
-'>>' => array( 'input'=>'>>', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE) // 2005-06-07 wes
-);
-
+<?php
+
+$symbol_arr = array(
+
+// Greek symbols
+'alpha' => array( 'input'=>'alpha','tag'=>'mi', 'output'=>'&#' . hexdec('03B1') . ';'),
+'beta' => array( 'input'=>'beta','tag'=>'mi', 'output'=>'&#' . hexdec('03B2') . ';'),
+'chi' => array( 'input'=>'chi','tag'=>'mi', 'output'=>'&#' . hexdec('03C7') . ';'),
+'delta' => array( 'input'=>'delta','tag'=>'mi', 'output'=>'&#' . hexdec('03B4') . ';'),
+'Delta' => array( 'input'=>'Delta','tag'=>'mo', 'output'=>'&#' . hexdec('0394') . ';'),
+'epsi' => array( 'input'=>'epsi','tag'=>'mi', 'output'=>'&#' . hexdec('03B5') . ';'),
+'varepsilon' => array( 'input'=>'varepsilon','tag'=>'mi', 'output'=>'&#' . hexdec('025B') . ';'),
+'eta' => array( 'input'=>'eta','tag'=>'mi', 'output'=>'&#' . hexdec('03B7') . ';'),
+'gamma' => array( 'input'=>'gamma','tag'=>'mi', 'output'=>'&#' . hexdec('03B3') . ';'),
+'Gamma' => array( 'input'=>'Gamma','tag'=>'mi', 'output'=>'&#' . hexdec('0393') . ';'),
+'iota' => array( 'input'=>'iota','tag'=>'mi', 'output'=>'&#' . hexdec('03B9') . ';'),
+'kappa' => array( 'input'=>'kappa','tag'=>'mi', 'output'=>'&#' . hexdec('03BA') . ';'),
+'lambda' => array( 'input'=>'lambda','tag'=>'mi', 'output'=>'&#' . hexdec('03BB') . ';'),
+'Lambda' => array( 'input'=>'Lambda','tag'=>'mo', 'output'=>'&#' . hexdec('039B') . ';'),
+'mu' => array( 'input'=>'mu','tag'=>'mi', 'output'=>'&#' . hexdec('03BC') . ';'),
+'nu' => array( 'input'=>'nu','tag'=>'mi', 'output'=>'&#' . hexdec('03BD') . ';'),
+'omega' => array( 'input'=>'omega','tag'=>'mi', 'output'=>'&#' . hexdec('03C9') . ';'),
+'Omega' => array( 'input'=>'Omega','tag'=>'mo', 'output'=>'&#' . hexdec('03A9') . ';'),
+'phi' => array( 'input'=>'phi','tag'=>'mi', 'output'=>'&#' . hexdec('03C6') . ';'),
+'varphi' => array( 'input'=>'varphi','tag'=>'mi', 'output'=>'&#' . hexdec('03D5') . ';'),
+'Phi' => array( 'input'=>'Phi','tag'=>'mo', 'output'=>'&#' . hexdec('03A6') . ';'),
+'pi' => array( 'input'=>'pi','tag'=>'mi', 'output'=>'&#' . hexdec('03C0') . ';'),
+'Pi' => array( 'input'=>'Pi','tag'=>'mo', 'output'=>'&#' . hexdec('03A0') . ';'),
+'psi' => array( 'input'=>'psi','tag'=>'mi', 'output'=>'&#' . hexdec('03C8') . ';'),
+'rho' => array( 'input'=>'rho','tag'=>'mi', 'output'=>'&#' . hexdec('03C1') . ';'),
+'sigma' => array( 'input'=>'sigma','tag'=>'mi', 'output'=>'&#' . hexdec('03C3') . ';'),
+'Sigma' => array( 'input'=>'Sigma','tag'=>'mo', 'output'=>'&#' . hexdec('03A3') . ';'),
+'tau' => array( 'input'=>'tau','tag'=>'mi', 'output'=>'&#' . hexdec('03C4') . ';'),
+'theta' => array( 'input'=>'theta','tag'=>'mi', 'output'=>'&#' . hexdec('03B8') . ';'),
+'vartheta' => array( 'input'=>'vartheta','tag'=>'mi', 'output'=>'&#' . hexdec('03D1') . ';'),
+'Theta' => array( 'input'=>'Theta','tag'=>'mo', 'output'=>'&#' . hexdec('0398') . ';'),
+'upsilon' => array( 'input'=>'upsilon','tag'=>'mi', 'output'=>'&#' . hexdec('03C5') . ';'),
+'xi' => array( 'input'=>'xi','tag'=>'mi', 'output'=>'&#' . hexdec('03BE') . ';'),
+'Xi' => array( 'input'=>'alpha','tag'=>'mo', 'output'=>'&#' . hexdec('039E') . ';'),
+'zeta' => array( 'input'=>'zeta','tag'=>'mi', 'output'=>'&#' . hexdec('03B6') . ';'),
+
+// Binary operation symbols
+'*' => array( 'input'=>'*','tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';'),
+'**' => array( 'input'=>'**','tag'=>'mo', 'output'=>'&#' . hexdec('22C6') . ';'),
+'//' => array( 'input'=>'//','tag'=>'mo', 'output'=>'/'),
+'\\\\' => array( 'input'=>'\\\\','tag'=>'mo', 'output'=>'\\'),
+'xx' => array( 'input'=>'xx','tag'=>'mo', 'output'=>'&#' . hexdec('00D7') . ';'),
+'-:' => array( 'input'=>'-:','tag'=>'mo', 'output'=>'&#' . hexdec('00F7') . ';'),
+'@' => array( 'input'=>'@','tag'=>'mo', 'output'=>'&#' . hexdec('2218') . ';'),
+'o+' => array( 'input'=>'o+','tag'=>'mo', 'output'=>'&#' . hexdec('2295') . ';'),
+'ox' => array( 'input'=>'ox','tag'=>'mo', 'output'=>'&#' . hexdec('2297') . ';'),
+'sum' => array( 'input'=>'sum','tag'=>'mo', 'output'=>'&#' . hexdec('2211') . ';', 'underover'=>TRUE),
+'prod' => array( 'input'=>'prod','tag'=>'mo', 'output'=>'&#' . hexdec('220F') . ';', 'underover'=>TRUE),
+'^^' => array( 'input'=>'^^','tag'=>'mo', 'output'=>'&#' . hexdec('2227') . ';'),
+'^^^' => array( 'input'=>'^^^','tag'=>'mo', 'output'=>'&#' . hexdec('22C0') . ';', 'underover'=>TRUE),
+'vv' => array( 'input'=>'vv','tag'=>'mo', 'output'=>'&#' . hexdec('2228') . ';'),
+'vvv' => array( 'input'=>'vvv','tag'=>'mo', 'output'=>'&#' . hexdec('22C1') . ';', 'underover'=>TRUE),
+'nn' => array( 'input'=>'nn','tag'=>'mo', 'output'=>'&#' . hexdec('2229') . ';'),
+'nnn' => array( 'input'=>'nnn','tag'=>'mo', 'output'=>'&#' . hexdec('22C5') . ';', 'underover'=>TRUE),
+'uu' => array( 'input'=>'uu','tag'=>'mo', 'output'=>'&#' . hexdec('222A') . ';'),
+'uuu' => array( 'input'=>'uuu','tag'=>'mo', 'output'=>'&#' . hexdec('22C3') . ';', 'underover'=>TRUE),
+
+// Binary relation symbols
+'!=' => array( 'input'=>'!=','tag'=>'mo', 'output'=>'&#' . hexdec('2260') . ';'),
+':=' => array( 'input'=>':=','tag'=>'mo', 'output'=>':=' ), /* 2005-06-05 wes */
+'<' => array( 'input'=>'<','tag'=>'mo', 'output'=>'<'),
+'lt' => array( 'input'=>'lt','tag'=>'mo', 'output'=>'<'), /* 2005-06-05 wes */
+'<=' => array( 'input'=>'<=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
+'lt=' => array( 'input'=>'lt=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
+'le' => array( 'input'=>'le','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), /* 2005-06-05 wes */
+'>' => array( 'input'=>'>','tag'=>'mo', 'output'=>'>'),
+'>=' => array( 'input'=>'>=','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
+'qeq' => array( 'input'=>'geq','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
+'-<' => array( 'input'=>'-<','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
+'-lt' => array( 'input'=>'-lt','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
+'>-' => array( 'input'=>'>-','tag'=>'mo', 'output'=>'&#' . hexdec('227B') . ';'),
+'in' => array( 'input'=>'in','tag'=>'mo', 'output'=>'&#' . hexdec('2208') . ';'),
+'!in' => array( 'input'=>'!in','tag'=>'mo', 'output'=>'&#' . hexdec('2209') . ';'),
+'sub' => array( 'input'=>'sub','tag'=>'mo', 'output'=>'&#' . hexdec('2282') . ';'),
+'sup' => array( 'input'=>'sup','tag'=>'mo', 'output'=>'&#' . hexdec('2283') . ';'),
+'sube' => array( 'input'=>'sube','tag'=>'mo', 'output'=>'&#' . hexdec('2286') . ';'),
+'supe' => array( 'input'=>'supe','tag'=>'mo', 'output'=>'&#' . hexdec('2287') . ';'),
+'-=' => array( 'input'=>'-=','tag'=>'mo', 'output'=>'&#' . hexdec('2261') . ';'),
+'~=' => array( 'input'=>'~=','tag'=>'mo', 'output'=>'&#' . hexdec('2245') . ';'),
+'~~' => array( 'input'=>'~~','tag'=>'mo', 'output'=>'&#' . hexdec('2248') . ';'),
+'prop' => array( 'input'=>'prop','tag'=>'mo', 'output'=>'&#' . hexdec('221D') . ';'),
+
+// Logical symbols
+'and' => array( 'input'=>'and','tag'=>'mtext', 'output'=>'and', 'space'=>'1ex'),
+'or' => array( 'input'=>'or','tag'=>'mtext', 'output'=>'or', 'space'=>'1ex'),
+'not' => array( 'input'=>'not','tag'=>'mo', 'output'=>'&#' . hexdec('00AC') . ';'),
+'=>' => array( 'input'=>'=>','tag'=>'mo', 'output'=>'&#' . hexdec('21D2') . ';'),
+'if' => array( 'input'=>'if','tag'=>'mo', 'output'=>'if', 'space'=>'1ex'),
+'iff' => array( 'input'=>'iff','tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'),
+'<=>' => array( 'input'=>'iff','tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'), /* 2005-06-07 wes */
+'AA' => array( 'input'=>'AA','tag'=>'mo', 'output'=>'&#' . hexdec('2200') . ';'),
+'EE' => array( 'input'=>'EE','tag'=>'mo', 'output'=>'&#' . hexdec('2203') . ';'),
+'_|_' => array( 'input'=>'_|_','tag'=>'mo', 'output'=>'&#' . hexdec('22A5') . ';'),
+'TT' => array( 'input'=>'TT','tag'=>'mo', 'output'=>'&#' . hexdec('22A4') . ';'),
+'|-' => array( 'input'=>'|-','tag'=>'mo', 'output'=>'&#' . hexdec('22A2') . ';'),
+'|=' => array( 'input'=>'|=','tag'=>'mo', 'output'=>'&#' . hexdec('22A8') . ';'),
+
+// Miscellaneous symbols
+'ang' => array('input'=>'ang','tag'=>'mo','output'=>'&#' . hexdec('2220') . ';'),
+'deg' => array('input'=>'deg','tag'=>'mo','output'=>'&#' . hexdec('00B0') . ';'),
+'int' => array( 'input'=>'int','tag'=>'mo', 'output'=>'&#' . hexdec('222B') . ';'),
+'dx' => array( 'input'=>'dx','tag'=>'mi', 'output'=>'{:d x:}', 'definition'=>TRUE), /* 2005-06-11 wes */
+'dy' => array( 'input'=>'dy','tag'=>'mi', 'output'=>'{:d y:}', 'definition'=>TRUE), /* 2005-06-11 wes */
+'dz' => array( 'input'=>'dz','tag'=>'mi', 'output'=>'{:d z:}', 'definition'=>TRUE), /* 2005-06-11 wes */
+'dt' => array( 'input'=>'dt','tag'=>'mi', 'output'=>'{:d t:}', 'definition'=>TRUE), /* 2005-06-11 wes */
+'oint' => array( 'input'=>'oint','tag'=>'mo', 'output'=>'&#' . hexdec('222E') . ';'),
+'del' => array( 'input'=>'del','tag'=>'mo', 'output'=>'&#' . hexdec('2202') . ';'),
+'grad' => array( 'input'=>'grad','tag'=>'mo', 'output'=>'&#' . hexdec('2207') . ';'),
+'+-' => array( 'input'=>'+-','tag'=>'mo', 'output'=>'&#' . hexdec('00B1') . ';'),
+'O/' => array( 'input'=>'0/','tag'=>'mo', 'output'=>'&#' . hexdec('2205') . ';'),
+'oo' => array( 'input'=>'oo','tag'=>'mo', 'output'=>'&#' . hexdec('221E') . ';'),
+'aleph' => array( 'input'=>'aleph','tag'=>'mo', 'output'=>'&#' . hexdec('2135') . ';'),
+'...' => array( 'input'=>'int','tag'=>'mo', 'output'=>'...'),
+'~' => array( 'input'=>'!~','tag'=>'mo', 'output'=>'&#' . hexdec('0020') . ';'),
+'\\ ' => array( 'input'=>'~','tag'=>'mo', 'output'=>'&#' . hexdec('00A0') . ';'),
+'quad' => array( 'input'=>'quad','tag'=>'mo', 'output'=>'&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';'),
+'qquad' => array( 'input'=>'qquad','tag'=>'mo', 'output'=> '&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';&#' . hexdec('00A0') . ';'),
+'cdots' => array( 'input'=>'cdots','tag'=>'mo', 'output'=>'&#' . hexdec('22EF') . ';'),
+'vdots' => array( 'input'=>'vdots','tag'=>'mo', 'output'=>'&#' . hexdec('22EE') . ';'), /* 2005-06-11 wes */
+'ddots' => array( 'input'=>'ddots','tag'=>'mo', 'output'=>'&#' . hexdec('22F1') . ';'), /* 2005-06-11 wes */
+'diamond' => array( 'input'=>'diamond','tag'=>'mo', 'output'=>'&#' . hexdec('22C4') . ';'),
+'square' => array( 'input'=>'square','tag'=>'mo', 'output'=>'&#' . hexdec('25A1') . ';'),
+'|_' => array( 'input'=>'|_','tag'=>'mo', 'output'=>'&#' . hexdec('230A') . ';'),
+'_|' => array( 'input'=>'_|','tag'=>'mo', 'output'=>'&#' . hexdec('230B') . ';'),
+'|~' => array( 'input'=>'|~','tag'=>'mo', 'output'=>'&#' . hexdec('2308') . ';'),
+'~|' => array( 'input'=>'~|','tag'=>'mo', 'output'=>'&#' . hexdec('2309') . ';'),
+'CC' => array( 'input'=>'CC','tag'=>'mo', 'output'=>'&#' . hexdec('2102') . ';'),
+'NN' => array( 'input'=>'NN','tag'=>'mo', 'output'=>'&#' . hexdec('2115') . ';'),
+'QQ' => array( 'input'=>'QQ','tag'=>'mo', 'output'=>'&#' . hexdec('211A') . ';'),
+'RR' => array( 'input'=>'RR','tag'=>'mo', 'output'=>'&#' . hexdec('211D') . ';'),
+'ZZ' => array( 'input'=>'ZZ','tag'=>'mo', 'output'=>'&#' . hexdec('2124') . ';'),
+
+// Standard functions
+'lim' => array( 'input'=>'lim','tag'=>'mo', 'output'=>'lim', 'underover'=>TRUE),
+'Lim' => array( 'input'=>'Lim','tag'=>'mo', 'output'=>'Lim', 'underover'=>TRUE), /* 2005-06-11 wes */
+'sin' => array( 'input'=>'sin','tag'=>'mo', 'output'=>'sin', 'unary'=>TRUE, 'func'=>TRUE),
+'cos' => array( 'input'=>'cos', 'tag'=>'mo', 'output'=>'cos', 'unary'=>TRUE, 'func'=>TRUE),
+'tan' => array( 'input'=>'tan', 'tag'=>'mo', 'output'=>'tan', 'unary'=>TRUE, 'func'=>TRUE),
+'arcsin' => array( 'input'=>'arcsin','tag'=>'mo', 'output'=>'arcsin', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
+'arccos' => array( 'input'=>'arccos', 'tag'=>'mo', 'output'=>'arccos', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
+'arctan' => array( 'input'=>'arctan', 'tag'=>'mo', 'output'=>'arctan', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
+'sinh' => array( 'input'=>'sinh','tag'=>'mo', 'output'=>'sinh', 'unary'=>TRUE, 'func'=>TRUE),
+'cosh' => array( 'input'=>'cosh', 'tag'=>'mo', 'output'=>'cosh', 'unary'=>TRUE, 'func'=>TRUE),
+'tanh' => array( 'input'=>'tanh', 'tag'=>'mo', 'output'=>'tanh', 'unary'=>TRUE, 'func'=>TRUE),
+'cot' => array( 'input'=>'cot','tag'=>'mo', 'output'=>'cot', 'unary'=>TRUE, 'func'=>TRUE),
+'sec' => array( 'input'=>'sec', 'tag'=>'mo', 'output'=>'sec', 'unary'=>TRUE, 'func'=>TRUE),
+'csc' => array( 'input'=>'csc', 'tag'=>'mo', 'output'=>'csc', 'unary'=>TRUE, 'func'=>TRUE),
+'coth' => array( 'input'=>'coth','tag'=>'mo', 'output'=>'coth', 'unary'=>TRUE, 'func'=>TRUE),
+'sech' => array( 'input'=>'sech', 'tag'=>'mo', 'output'=>'sech', 'unary'=>TRUE, 'func'=>TRUE),
+'csch' => array( 'input'=>'csch', 'tag'=>'mo', 'output'=>'csch', 'unary'=>TRUE, 'func'=>TRUE),
+'log' => array( 'input'=>'log', 'tag'=>'mo', 'output'=>'log', 'unary'=>TRUE, 'func'=>TRUE),
+'ln' => array( 'input'=>'ln', 'tag'=>'mo', 'output'=>'ln', 'unary'=>TRUE, 'func'=>TRUE),
+'det' => array( 'input'=>'det', 'tag'=>'mo', 'output'=>'det', 'unary'=>TRUE, 'func'=>TRUE),
+'dim' => array( 'input'=>'dim', 'tag'=>'mo', 'output'=>'dim'),
+'mod' => array( 'input'=>'mod', 'tag'=>'mo', 'output'=>'mod'),
+'gcd' => array( 'input'=>'gcd', 'tag'=>'mo', 'output'=>'gcd', 'unary'=>TRUE, 'func'=>TRUE),
+'lcm' => array( 'input'=>'lcm', 'tag'=>'mo', 'output'=>'lcm', 'unary'=>TRUE, 'func'=>TRUE),
+'lub' => array( 'input'=>'lub', 'tag'=>'mo', 'output'=>'lub'), /* 2005-06-11 wes */
+'glb' => array( 'input'=>'glb', 'tag'=>'mo', 'output'=>'glb'), /* 2005-06-11 wes */
+'min' => array( 'input'=>'min', 'tag'=>'mo', 'output'=>'min', 'underover'=>TRUE), /* 2005-06-11 wes */
+'max' => array( 'input'=>'max', 'tag'=>'mo', 'output'=>'max', 'underover'=>TRUE), /* 2005-06-11 wes */
+'f' => array( 'input'=>'f','tag'=>'mi', 'output'=>'f', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
+'g' => array( 'input'=>'g', 'tag'=>'mi', 'output'=>'g', 'unary'=>TRUE, 'func'=>TRUE), //2006-9-7 DL
+
+// Arrows
+'uarr' => array( 'input'=>'uarr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2191') . ';'),
+'darr' => array( 'input'=>'darr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2193') . ';'),
+'rarr' => array( 'input'=>'rarr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2192') . ';'),
+'->' => array( 'input'=>'->', 'tag'=>'mo', 'output'=>'&#' . hexdec('2192') . ';'),
+'|->' => array( 'input'=>'|->', 'tag'=>'mo', 'output'=>'&#' . hexdec('21A6') . ';'), /* 2005-06-11 wes */
+'larr' => array( 'input'=>'larr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2190') . ';'),
+'harr' => array( 'input'=>'harr', 'tag'=>'mo', 'output'=>'&#' . hexdec('2194') . ';'),
+'rArr' => array( 'input'=>'rArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D2') . ';'),
+'lArr' => array( 'input'=>'lArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D0') . ';'),
+'hArr' => array( 'input'=>'hArr', 'tag'=>'mo', 'output'=>'&#' . hexdec('21D4') . ';'),
+
+// Commands with argument
+'sqrt' => array( 'input'=>'sqrt', 'tag'=>'msqrt', 'output'=>'sqrt', 'unary'=>TRUE ),
+'root' => array( 'input'=>'root', 'tag'=>'mroot', 'output'=>'root', 'binary'=>TRUE ),
+'frac' => array( 'input'=>'frac', 'tag'=>'mfrac', 'output'=>'/', 'binary'=>TRUE),
+'/' => array( 'input'=>'/', 'tag'=>'mfrac', 'output'=>'/', 'infix'=>TRUE),
+'_' => array( 'input'=>'_', 'tag'=>'msub', 'output'=>'_', 'infix'=>TRUE),
+'^' => array( 'input'=>'^', 'tag'=>'msup', 'output'=>'^', 'infix'=>TRUE),
+'hat' => array( 'input'=>'hat', 'tag'=>'mover', 'output'=>'&#' . hexdec('005E') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
+'bar' => array( 'input'=>'bar', 'tag'=>'mover', 'output'=>'&#' . hexdec('00AF') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
+'vec' => array( 'input'=>'vec', 'tag'=>'mover', 'output'=>'&#' . hexdec('2192') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
+'dot' => array( 'input'=>'dot', 'tag'=>'mover', 'output'=>'.', 'unary'=>TRUE, 'acc'=>TRUE),
+'ddot' => array( 'input'=>'ddot', 'tag'=>'mover', 'output'=>'..', 'unary'=>TRUE, 'acc'=>TRUE),
+'ul' => array( 'input'=>'ul', 'tag'=>'munder', 'output'=>'&#' . hexdec('0332') . ';', 'unary'=>TRUE, 'acc'=>TRUE),
+'avec' => array( 'input'=>'avec', 'tag'=>'munder', 'output'=>'~', 'unary'=>TRUE, 'acc'=>TRUE),
+'text' => array( 'input'=>'text', 'tag'=>'mtext', 'output'=>'text', 'unary'=>TRUE),
+'mbox' => array( 'input'=>'mbox', 'tag'=>'mtext', 'output'=>'mbox', 'unary'=>TRUE),
+'"' => array( 'input'=>'"', 'tag'=>'mtext','output'=>'mbox', 'unary'=>TRUE),
+
+/* 2005-06-05 wes: added stackrel */
+'stackrel' => array( 'input'=>'stackrel', 'tag'=>'mover', 'output'=>'stackrel', 'binary'=>TRUE),
+
+// Grouping brackets
+'(' => array( 'input'=>'(', 'tag'=>'mo', 'output'=>'(', 'left_bracket'=>TRUE),
+')' => array( 'input'=>')', 'tag'=>'mo', 'output'=>')', 'right_bracket'=>TRUE),
+'[' => array( 'input'=>'[', 'tag'=>'mo', 'output'=>'[', 'left_bracket'=>TRUE),
+']' => array( 'input'=>']', 'tag'=>'mo', 'output'=>']', 'right_bracket'=>TRUE),
+'{' => array( 'input'=>'{', 'tag'=>'mo', 'output'=>'{', 'left_bracket'=>TRUE),
+'}' => array( 'input'=>'}', 'tag'=>'mo', 'output'=>'}', 'right_bracket'=>TRUE),
+'(:' => array( 'input'=>'(:', 'tag'=>'mo', 'output'=>'&#' . hexdec('2329') . ';', 'left_bracket'=>TRUE),
+':)' => array( 'input'=>':)', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE),
+'{:' => array( 'input'=>'{:', 'tag'=>'mo', 'output'=>'{:', 'left_bracket'=>TRUE, 'invisible'=>TRUE),
+':}' => array( 'input'=>':}', 'tag'=>'mo', 'output'=>':}', 'right_bracket'=>TRUE ,'invisible'=>TRUE),
+'<<' => array( 'input'=>'<<', 'tag'=>'mo', 'output'=>'&#' . hexdec('2329') . ';', 'left_bracket'=>TRUE), // 2005-06-07 wes
+'>>' => array( 'input'=>'>>', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE) // 2005-06-07 wes
+);
+
?>
\ No newline at end of file
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php 2009-09-05 17:12:17 UTC (rev 7100)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php 2009-09-09 12:36:06 UTC (rev 7101)
@@ -1,1119 +1,1119 @@
-<?php
-
-/****
- * ASCIIMathPHP and associated classes:
- * -- XMLNode
- * -- MathMLNode extends XMLNode
- *
- * These classes are a PHP port of ASCIIMath
- * Version 1.3 Feb 19 2004, (c) Peter Jipsen http://www.chapman.edu/~jipsen
- *
- * ASCIIMathPHP Version 1.11, 26 April 2006, (c) Kee-Lin Steven Chan (kc...@co...)
- *
- * 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 (at http://www.gnu.org/copyleft/gpl.html)
- * for more details.
- *
- * ChangeLog
- *
- * Ver 2.0
- * -- PHP5 only version of ASCIIMathPHP
- *
- * Ver 1.12.1
- * -- Included the missing setCurrExpr() method
- *
- * Ver 1.12
- * -- Added changes that David Lippman <DLi...@pi...> made to bring ASCIIMathPHP up to
- * ASCIIMath 1.4.7 functionality.
- * -- Added parseIntExpr, for intermediate expression parsing rule, allowing x^2/x^3 to render as (x^2)/(x^3)
- * -- Added quotes as another way of designating text; "hello" is equivalent to text(hello)
- * -- Added FUNC designator to allow sin, cos, etc to act as functions, so sin(x)/x renders as {sin(x)}/x
- *
- * Ver 1.11
- * -- Fixed bug that stopped script execution for incomplete expressions
- * -- Changed the algorithm for parsing expressions so that it matches the longest string possible (greedy)
- *
- * Ver 1.10
- * -- Added definition support
- * -- Added stackrel support
- * -- Added a bunch of different symbols etc. >>, << and definitions like dx, dy, dz etc.
- *
- * Ver 1.02
- * -- Fixed bug with mbox and text
- * -- Fixed spacing bug with mbox and text
- *
- * Ver 1.01
- * -- Fixed Bug that did not parse symbols greater than a single character
- * correctly when appearing at end of expression.
- *
- ***/
-
-class XMLNode
-{
- // Private variables
- var $_id;
- var $_name;
- var $_content;
- var $_mt_elem_flg;
- var $_attr_arr;
- var $_child_arr;
- var $_nmspc;
- var $_nmspc_alias;
- var $_parent_id;
- var $_parent_node;
-
- function XMLNode($id = NULL)
- {
- $this->_id = isset($id) ? $id : md5(uniqid(rand(),1));
- $this->_name = '';
- $this->_content = '';
- $this->_mt_elem_flg = FALSE;
- $this->_attr_arr = array();
- $this->_child_arr = array();
- $this->_nmspc = '';
- $this->_nmspc_alias = '';
- $this->_parent_id = FALSE;
- $this->_parent_node = NULL;
- }
-
- function addChild(&$node)
- {
- $this->_child_arr[$node->getId()] = $node;
- $node->setParentId($this->_id);
- $node->setParentNode($this);
- }
-
- function addChildArr(&$node_arr)
- {
- $key_arr = array_keys($node_arr);
- $num_key = count($key_arr);
-
- for ($i = 0; $i < $num_key; $i++) {
- $node = $node_arr[$key_arr[$i]];
- $this->addChild($node);
- }
- }
-
- function insertChildBefore($idx,&$node)
- {
- $key_arr = array_keys($this->_child_arr);
- $num_key = count($key_arr);
- $tmp_arr = arry();
-
- for ($i = 0;$i < $num_key;$i++) {
- if ($i == $idx) {
- $tmp_arr[$node->getId()] = $node;
- }
- $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
- }
- $this->_child_arr = $tmp_arr;
- }
-
- function insertChildAfter($idx,&$node)
- {
- $key_arr = array_keys($this->_child_arr);
- $num_key = count($key_arr);
- $tmp_arr = arry();
-
- for ($i = 0;$i < $num_key;$i++) {
- $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
- if ($i == $idx) {
- $tmp_arr[$node->getId()] = $node;
- }
- }
- $this->_child_arr = $tmp_arr;
- }
-
- function setId($id)
- {
- $this->_id = $id;
- }
-
- function setName($name)
- {
- $this->_name = $name;
- }
-
- function setNamepace($nmspc)
- {
- $this->_nmspc = $nmspc;
- }
-
- function setNamespaceAlias($nmspc_alias)
- {
- $this->_nmspc_alias = $nmspc_alias;
- }
-
- function setContent($content)
- {
- $this->_content = $content;
- }
-
- function setEmptyElem($mt_elem_flg)
- {
- $this->_mt_elem_flg = $mt_elem_flg;
- }
-
- function setAttr($attr_nm,$attr_val)
- {
- $this->_attr_arr[$attr_nm] = $attr_val;
- }
-
- function setAttrArr($attr_arr)
- {
- $this->_attr_arr = $attr_arr;
- }
-
- function setParentId($id)
- {
- $this->_parent_id = $id;
- }
-
- function setParentNode(&$node)
- {
- $this->_parent_node = $node;
- }
-
- function getId()
- {
- return($this->_id);
- }
-
- function getName()
- {
- return($this->_name);
- }
-
- function getNamespace()
- {
- return($this->_nmspc);
- }
-
- function getNamespaceAlias()
- {
- return($this->_nmspc_alias);
- }
-
- function getContent()
- {
- return($this->_content);
- }
-
- function getAttr($attr_nm)
- {
- if (isset($this->_attr_arr[$attr_nm])) {
- return($this->_attr_arr[$attr_nm]);
- } else {
- return(NULL);
- }
- }
-
- function getAttrArr()
- {
- return($this->_attr_arr);
- }
-
- function getParentId()
- {
- return($this->parent_id);
- }
-
- function getParentNode()
- {
- return($this->_parent_node);
- }
-
- function getChild($id)
- {
- if (isset($this->_child_arr[$id])) {
- return($this->_child_arr[$id]);
- } else {
- return(FALSE);
- }
- }
-
- function getFirstChild()
- {
- $id_arr = array_keys($this->_child_arr);
- $num_child = count($id_arr);
-
- if ($num_child > 0) {
- return($this->_child_arr[$id_arr[0]]);
- } else {
- return(FALSE);
- }
- }
-
- function getLastChild()
- {
- $id_arr = array_keys($this->_child_arr);
- $num_child = count($id_arr);
-
- if ($num_child > 0) {
- return($this->_child_arr[$id_arr[$num_child - 1]]);
- } else {
- return(FALSE);
- }
- }
-
- function getChildByIdx($idx)
- {
- $id_arr = array_keys($this->_child_arr);
-
- if (isset($this->_child_arr[$id_arr[$idx]])) {
- return($this->_child_arr[$id_arr[$idx]]);
- } else {
- return(FALSE);
- }
- }
-
- function getNumChild()
- {
- return(count($this->_child_arr));
- }
-
- function removeChild($id)
- {
- unset($this->_child_arr[$id]);
- }
-
- function removeChildByIdx($idx)
- {
- $key_arr = array_keys($this->_child_arr);
- unset($this->_child_arr[$key_arr[$idx]]);
- }
-
- function removeFirstChild()
- {
- $key_arr = array_keys($this->_child_arr);
- unset($this->_child_arr[$key_arr[0]]);
- }
-
- function removeLastChild()
- {
- $key_arr = array_keys($this->_child_arr);
- unset($this->_child_arr[$key_arr[count($key_arr)-1]]);
- }
-
- function dumpXML($indent_str = "\t")
- {
- $attr_txt = $this->_dumpAttr();
- $name = $this->_dumpName();
- $xmlns = $this->_dumpXmlns();
- $lvl = $this->_getCurrentLevel();
- $indent = str_pad('',$lvl,$indent_str);
-
- if ($this->_mt_elem_flg) {
- $tag = "$indent<$name$xmlns$attr_txt />";
- return($tag);
- } else {
- $key_arr = array_keys($this->_child_arr);
- $num_child = count($key_arr);
-
- $tag = "$indent<$name$xmlns$attr_txt>$this->_content";
-
- for ($i = 0;$i < $num_child;$i++) {
- $node = $this->_child_arr[$key_arr[$i]];
-
- $child_txt = $node->dumpXML($indent_str);
- $tag .= "\n$child_txt";
- }
-
- $tag .= ($num_child > 0 ? "\n$indent</$name>" : "</$name>");
- return($tag);
- }
- }
-
- function _dumpAttr()
- {
- $id_arr = array_keys($this->_attr_arr);
- $id_arr_cnt = count($id_arr);
- $attr_txt = '';
-
- for($i = 0;$i < $id_arr_cnt;$i++) {
- $key = $id_arr[$i];
- $attr_txt .= " $key=\"{$this->_attr_arr[$key]}\"";
- }
-
- return($attr_txt);
- }
-
- function _dumpName()
- {
- $alias = $this->getNamespaceAlias();
- if ($alias == '') {
- return($this->getName());
- } else {
- return("$alias:" . $this->getName());
- }
- }
-
- function _dumpXmlns()
- {
- $nmspc = $this->getNamespace();
- $alias = $this->getNamespaceAlias();
-
- if ($nmspc != '') {
- if ($alias == '') {
- return(" xmlns=\"" . $nmspc . "\"");
- } else {
- return(" xmlns:$alias=\"" . $nmspc . "\"");
- }
- } else {
- return('');
- }
- }
-
- function _getCurrentLevel()
- {
- if ($this->_parent_id === FALSE) {
- return(0);
- } else {
- $node = $this->getParentNode();
- $lvl = $node->_getCurrentLevel();
- $lvl++;
- return($lvl);
- }
- }
-}
-
-class MathMLNode extends XMLNode
-{
- function MathMLNode($id = NULL)
- {
- parent::XMLNode($id);
- }
-
- function removeBrackets()
- {
- if ($this->_name == 'mrow') {
- if ($c_node_0 = $this->getFirstChild()) {
- $c_node_0->isLeftBracket() ? $this->removeFirstChild() : 0;
- }
-
- if ($c_node_0 = $this->getLastChild()) {
- $c_node_0->isRightBracket() ? $this->removeLastChild() : 0;
- }
- }
- }
-
- function isLeftBracket()
- {
- switch ($this->_content) {
- case '{':
- case '[':
- case '(':
- return(TRUE);
- break;
- }
- return(FALSE);
- }
-
- function isRightBracket()
- {
- switch ($this->_content) {
- case '}':
- case ']':
- case ')':
- return(TRUE);
- break;
- }
- return(FALSE);
- }
-}
-
-class ASCIIMathPHP
-{
- var $_expr;
- var $_curr_expr;
- var $_prev_expr;
- var $_symbol_arr;
- var $_node_arr;
- var $_node_cntr;
-
- function ASCIIMathPHP($symbol_arr,$expr = NULL)
- {
- $this->_symbol_arr = $symbol_arr;
- if (isset($expr)) {
- $this->setExpr($expr);
- }
- }
-
- /**
- * Returns an empty node (containing a non-breaking space) 26-Apr-2006
- *
- * Used when an expression is incomplete
- *
- * @return object
- *
- * @access private
- */
- function emptyNode()
- {
- $tmp_node = $this->createNode();
- $tmp_node->setName('mn');
- $tmp_node->setContent('&#' . hexdec('200B') . ';');
- return $tmp_node;
- }
-
- function pushExpr($prefix) // 2005-06-11 wes
- {
- $this->_curr_expr = $prefix . $this->_curr_expr;
- }
-
- function setExpr($expr)
- {
- $this->_expr = $expr;
- $this->_curr_expr = $expr;
- $this->_prev_expr = $expr;
-
- $this->_node_arr = array();
- $this->_node_cntr = 0;
- }
-
- function genMathML($attr_arr = NULL)
- {
- // <math> node
- $node_0 = $this->createNode();
- $node_0->setName('math');
- $node_0->setNamepace('http://www.w3.org/1998/Math/MathML');
-
- // <mstyle> node
- if (isset($attr_arr)) {
- $node_1 = $this->createNode();
- $node_1->setName('mstyle');
- $node_1->setAttrArr($attr_arr);
-
- $node_arr = $this->parseExpr();
-
- $node_1->addChildArr($node_arr);
- $node_0->addChild($node_1);
- } else {
- $node_arr = $this->parseExpr();
- $node_0->addChildArr($node_arr);
- }
-
- return TRUE;
- }
-
- /*
- function mergeNodeArr(&$node_arr_0,&$node_arr_1)
- {
- $key_arr_0 = array_keys($node_arr_0);
- $key_arr_1 = array_keys($node_arr_1);
-
- $num_key_0 = count($key_arr_0);
- $num_key_1 = count($key_arr_1);
-
- $merge_arr = array();
-
- for ($i = 0;$i < $num_key_0;$i++) {
- $merge_arr[$key_arr_0[$i]] = $node_arr_0[$key_arr_0[$i]];
- }
-
- for ($j = 0;$j < $num_key_1;$i++) {
- $merge_arr[$key_arr_1[$i]] = $node_arr_1[$key_arr_1[$i]];
- }
-
- return($merge_arr);
- }
- */
-
- //Broken out of parseExpr Sept 7, 2006 David Lippman for
- //ASCIIMathML 1.4.7 compatibility
- function parseIntExpr()
- {
- $sym_0 = $this->getSymbol();
- $node_0 = $this->parseSmplExpr();
- $sym = $this->getSymbol();
-
- if (isset($sym['infix']) && $sym['input'] != '/') {
- $this->chopExpr($sym['symlen']);
- $node_1 = $this->parseSmplExpr();
-
- if ($node_1 === FALSE) { //show box in place of missing argument
- $node_1 = $this->emptyNode();//??
- } else {
- $node_1->removeBrackets();
- }
-
- // If 'sub' -- subscript
- if ($sym['input'] == '_') {
-
- $sym_1 = $this->getSymbol();
-
- // If 'sup' -- superscript
- if ($sym_1['input'] == '^') {
- $this->chopExpr($sym_1['symlen']);
- $node_2 = $this->parseSmplExpr();
- $node_2->removeBrackets();
-
- $node_3 = $this->createNode();
- $node_3->setName(isset($sym_0['underover']) ? 'munderover' : 'msubsup');
- $node_3->addChild($node_0);
- $node_3->addChild($node_1);
- $node_3->addChild($node_2);
-
- $node_4 = $this->createNode();
- $node_4->setName('mrow');
- $node_4->addChild($node_3);
-
- return $node_4;
- } else {
- $node_2 = $this->createNode();
- $node_2->setName(isset($sym_0['underover']) ? 'munder' : 'msub');
- $node_2->addChild($node_0);
- $node_2->addChild($node_1);
-
- return $node_2;
- }
- } else {
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->addChild($node_0);
- $node_2->addChild($node_1);
-
- return($node_2);
- }
- } elseif ($node_0 !== FALSE) {
- return($node_0);
- } else {
- return $this->emptyNode();
- }
-
- }
-
- function parseExpr()
- {
- // Child/Fragment array
- $node_arr = array();
-
- // Deal whole expressions like 'ax + by + c = 0' etc.
- do {
- $sym_0 = $this->getSymbol();
- $node_0 = $this->parseIntExpr();
- $sym = $this->getSymbol();
- // var_dump($sym);
-
- if (isset($sym['infix']) && $sym['input'] == '/') {
- $this->chopExpr($sym['symlen']);
- $node_1 = $this->parseIntExpr();
-
- if ($node_1 === FALSE) { //should show box in place of missing argument
- $node_1 = $this->emptyNode();
- continue;
- }
-
- $node_1->removeBrackets();
-
- // If 'div' -- divide
- $node_0->removeBrackets();
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->addChild($node_0);
- $node_2->addChild($node_1);
- $node_arr[$node_2->getId()] = $node_2;
-
- } elseif ($node_0 !== FALSE) {
- $node_arr[$node_0->getId()] = $node_0;
- }
- } while (!isset($sym['right_bracket']) && $sym !== FALSE && $sym['output'] != '');
-
- //var_dump($sym);
- // Possibly to deal with matrices
- if (isset($sym['right_bracket'])) {
- $node_cnt = count($node_arr);
- $key_node_arr = array_keys($node_arr);
-
- if ($node_cnt > 1) {
- $node_5 = $node_arr[$key_node_arr[$node_cnt-1]];
- $node_6 = $node_arr[$key_node_arr[$node_cnt-2]];
- } else {
- $node_5 = FALSE;
- $node_6 = FALSE;
- }
-
- // Dealing with matrices
- if ($node_5 !== FALSE && $node_6 !== FALSE &&
- $node_cnt > 1 &&
- $node_5->getName() == 'mrow' &&
- $node_6->getName() == 'mo' &&
- $node_6->getContent() == ',') {
-
- // Checking if Node 5 has a LastChild
- if ($node_7 = $node_5->getLastChild()) {
- $node_7_cntnt = $node_7->getContent();
- } else {
- $node_7_cntnt = FALSE;
- }
-
- // If there is a right bracket
- if ($node_7 !== FALSE && ($node_7_cntnt == ']' || $node_7_cntnt == ')')) {
-
- // Checking if Node 5 has a firstChild
- if ($node_8 = $node_5->getFirstChild()) {
- $node_8_cntnt = $node_8->getContent();
- } else {
- $node_8_cntnt = FALSE;
- }
-
- // If there is a matching left bracket
- if ($node_8 !== FALSE &&
- (($node_8_cntnt == '(' && $node_7_cntnt == ')' && $sym['output'] != '}') ||
- ($node_8_cntnt == '[' && $node_7_cntnt == ']'))) {
-
- $is_mtrx_flg = TRUE;
- $comma_pos_arr = array();
-
- $i = 0;
-
- while ($i < $node_cnt && $is_mtrx_flg) {
- $tmp_node = $node_arr[$key_node_arr[$i]];
-
- if($tmp_node_first = $tmp_node->getFirstChild()) {
- $tnfc = $tmp_node_first->getContent();
- } else {
- $tnfc = FALSE;
- }
-
- if($tmp_node_last = $tmp_node->getLastChild()) {
- $tnlc = $tmp_node_last->getContent();
- } else {
- $tnlc = FALSE;
- }
-
- if (isset($key_node_arr[$i+1])) {
- $next_tmp_node = $node_arr[$key_node_arr[$i+1]];
- $ntnn = $next_tmp_node->getName();
- $ntnc = $next_tmp_node->getContent();
- } else {
- $ntnn = FALSE;
- $ntnc = FALSE;
- }
-
- // Checking each node in node array for matrix criteria
- if ($is_mtrx_flg) {
- $is_mtrx_flg = $tmp_node->getName() == 'mrow' &&
- ($i == $node_cnt-1 || $ntnn == 'mo' && $ntnc == ',') &&
- $tnfc == $node_8_cntnt && $tnlc == $node_7_cntnt;
- }
-
- if ($is_mtrx_flg) {
- for ($j = 0;$j < $tmp_node->getNumChild();$j++) {
- $tmp_c_node = $tmp_node->getChildByIdx($j);
-
- if ($tmp_c_node->getContent() == ',') {
- $comma_pos_arr[$i][] = $j;
- }
- }
- }
-
- if ($is_mtrx_flg && $i > 1) {
-
- $cnt_cpan = isset($comma_pos_arr[$i]) ? count($comma_pos_arr[$i]) : NULL;
- $cnt_cpap = isset($comma_pos_arr[$i-2]) ? count($comma_pos_arr[$i-2]) : NULL;
- $is_mtrx_flg = $cnt_cpan == $cnt_cpap;
- }
-
- $i += 2;
- }
-
- // If the node passes the matrix tests
- if ($is_mtrx_flg) {
- $tab_node_arr = array();
-
- for ($i = 0;$i < $node_cnt;$i += 2) {
- $tmp_key_node_arr = array_keys($node_arr);
- if (!($tmp_node = $node_arr[$tmp_key_node_arr[0]])) {
- break;
- }
- $num_child = $tmp_node->getNumChild();
- $k = 0;
-
- $tmp_node->removeFirstChild();
-
- $row_node_arr = array();
- $row_frag_node_arr = array();
-
- for ($j = 1;$j < ($num_child-1);$j++) {
- if (isset($comma_pos_arr[$i][$k]) &&
- $j == $comma_pos_arr[$i][$k]) {
-
- $tmp_node->removeFirstChild();
-
- $tmp_c_node = $this->createNode();
- $tmp_c_node->setName('mtd');
- $tmp_c_node->addChildArr($row_frag_node_arr);
- $row_frag_node_arr = array();
-
- $row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-
- $k++;
- } else {
-
- if ($tmp_c_node = $tmp_node->getFirstChild()) {
- $row_frag_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
- $tmp_node->removeFirstChild();
- }
- }
- }
-
- $tmp_c_node = $this->createNode();
- $tmp_c_node->setName('mtd');
- $tmp_c_node->addChildArr($row_frag_node_arr);
-
- $row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-
- if (count($node_arr) > 2) {
- $tmp_key_node_arr = array_keys($node_arr);
- unset($node_arr[$tmp_key_node_arr[0]]);
- unset($node_arr[$tmp_key_node_arr[1]]);
- }
-
- $tmp_c_node = $this->createNode();
- $tmp_c_node->setName('mtr');
- $tmp_c_node->addChildArr($row_node_arr);
-
- $tab_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
- }
-
- $tmp_c_node = $this->createNode();
- $tmp_c_node->setName('mtable');
- $tmp_c_node->addChildArr($tab_node_arr);
-
- if (isset($sym['invisible'])) {
- $tmp_c_node->setAttr('columnalign','left');
- }
-
- $key_node_arr = array_keys($node_arr);
- $tmp_c_node->setId($key_node_arr[0]);
-
- $node_arr[$tmp_c_node->getId()] = $tmp_c_node;
- }
- }
- }
- }
-
- $this->chopExpr($sym['symlen']);
- if (!isset($sym['invisible'])) {
- $node_7 = $this->createNode();
- $node_7->setName('mo');
- $node_7->setContent($sym['output']);
- $node_arr[$node_7->getId()] = $node_7;
- }
- }
-
- return($node_arr);
- }
-
- function parseSmplExpr()
- {
- $sym = $this->getSymbol();
-
- if (!$sym || isset($sym['right_bracket'])) //return FALSE;
- return $this->emptyNode();
-
- $this->chopExpr($sym['symlen']);
-
- // 2005-06-11 wes: add definition type support
- if(isset($sym['definition'])) {
- $this->pushExpr($sym['output']);
- $sym = $this->getSymbol();
- $this->chopExpr($sym['symlen']);
- }
-
- if (isset($sym['left_bracket'])) {
- $node_arr = $this->parseExpr();
-
- if (isset($sym['invisible'])) {
- $node_0 = $this->createNode();
- $node_0->setName('mrow');
- $node_0->addChildArr($node_arr);
-
- return($node_0);
- } else {
- $node_0 = $this->createNode();
- $node_0->setName('mo');
- $node_0->setContent($sym['output']);
-
- $node_1 = $this->createNode();
- $node_1->setName('mrow');
- $node_1->addChild($node_0);
- $node_1->addChildArr($node_arr);
-
- return($node_1);
- }
- } elseif (isset($sym['unary'])) {
-
- if ($sym['input'] == 'sqrt') {
- $node_0 = $this->parseSmplExpr();
- $node_0->removeBrackets();
-
- $node_1 = $this->createNode();
- $node_1->setName($sym['tag']);
- $node_1->addChild($node_0);
-
- return($node_1);
- } elseif (isset($sym['func'])) { //added 2006-9-7 David Lippman
- $expr = ltrim($this->getCurrExpr());
- $st = $expr{0};
- $node_0 = $this->parseSmplExpr();
- //$node_0->removeBrackets();
- if ($st=='^' || $st == '_' || $st=='/' || $st=='|' || $st==',') {
- $node_1 = $this->createNode();
- $node_1->setName($sym['tag']);
- $node_1->setContent($sym['output']);
- $this->setCurrExpr($expr);
- return($node_1);
- } else {
- $node_1 = $this->createNode();
- $node_1->setName('mrow');
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->setContent($sym['output']);
- $node_1->addChild($node_2);
- $node_1->addChild($node_0);
- return($node_1);
- }
- } elseif ($sym['input'] == 'text' || $sym['input'] == 'mbox' || $sym['input'] == '"') {
- $expr = ltrim($this->getCurrExpr());
- if ($sym['input']=='"') {
- $end_brckt = '"';
- $txt = substr($expr,0,strpos($expr,$end_brckt));
- } else {
- switch($expr{0}) {
- case '(':
- $end_brckt = ')';
- break;
- case '[':
- $end_brckt = ']';
- break;
- case '{':
- $end_brckt = '}';
- break;
- default:
- $end_brckt = chr(11); // A character that will never be matched.
- break;
- }
- $txt = substr($expr,1,strpos($expr,$end_brckt)-1);
- }
-
- //$txt = substr($expr,1,strpos($expr,$end_brckt)-1);
- $len = strlen($txt);
-
- $node_0 = $this->createNode();
- $node_0->setName('mrow');
-
- if ($len > 0) {
- if ($txt{0} == " ") {
- $node_1 = $this->createNode();
- $node_1->setName('mspace');
- $node_1->setAttr('width','1ex');
-
- $node_0->addChild($node_1);
- }
-
- $node_3 = $this->createNode();
- $node_3->setName($sym['tag']);
- $node_3->setContent(trim($txt));
-
- $node_0->addChild($node_3);
-
- if ($len > 1 && $txt{$len-1} == " ") {
- $node_2 = $this->createNode();
- $node_2->setName('mspace');
- $node_2->setAttr('width','1ex');
-
- $node_0->addChild($node_2);
- }
-
- $this->chopExpr($len+2);
- }
- return($node_0);
-
- } elseif (isset($sym['acc'])) {
- $node_0 = $this->parseSmplExpr();
- $node_0->removeBrackets();
-
- $node_1 = $this->createNode();
- $node_1->setName($sym['tag']);
- $node_1->addChild($node_0);
-
- $node_2 = $this->createNode();
- $node_2->setName('mo');
- $node_2->setContent($sym['output']);
-
- $node_1->addChild($node_2);
- return($node_1);
- } else {
- // Font change commands -- to complete
- }
- } elseif (isset($sym['binary'])) {
- $node_arr = array();
-
- $node_0 = $this->parseSmplExpr();
- $node_0->removeBrackets();
-
- $node_1 = $this->parseSmplExpr();
- $node_1->removeBrackets();
-
- /* 2005-06-05 wes: added stackrel */
- if ($sym['input'] == 'root' || $sym['input'] == 'stackrel') {
- $node_arr[$node_1->getId()] = $node_1;
- $node_arr[$node_0->getId()] = $node_0;
- } elseif ($sym['input'] == 'frac') {
- $node_arr[$node_0->getId()] = $node_0;
- $node_arr[$node_1->getId()] = $node_1;
- }
-
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->addChildArr($node_arr);
-
- return($node_2);
- } elseif (isset($sym['infix'])) {
- $node_0 = $this->createNode();
- $node_0->setName('mo');
- $node_0->setContent($sym['output']);
-
- return($node_0);
- } elseif (isset($sym['space'])) {
- $node_0 = $this->createNode();
- $node_0->setName('mrow');
-
- $node_1 = $this->createNode();
- $node_1->setName('mspace');
- $node_1->setAttr('width',$sym['space']);
-
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->setContent($sym['output']);
-
- $node_3 = $this->createNode();
- $node_3->setName('mspace');
- $node_3->setAttr('width',$sym['space']);
-
...
[truncated message content] |
|
From: <var...@us...> - 2009-09-05 17:12:27
|
Revision: 7100
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7100&view=rev
Author: vargenau
Date: 2009-09-05 17:12:17 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
Remove empty _setTightness
Modified Paths:
--------------
trunk/lib/BlockParser.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2009-09-05 10:48:26 UTC (rev 7099)
+++ trunk/lib/BlockParser.php 2009-09-05 17:12:17 UTC (rev 7100)
@@ -477,7 +477,6 @@
}
function _setTightness ($top, $bot) {
- // $this->_element->setTightness($top, $bot);
}
function merge ($followingBlock) {
@@ -1213,10 +1212,6 @@
$this->_element = new Block_HtmlElement('hr');
return true;
}
-
- function _setTightness($top, $bot) {
- // Don't tighten <hr/>s
- }
}
class Block_heading extends BlockMarkup
@@ -1232,10 +1227,6 @@
return true;
}
-
- function _setTightness($top, $bot) {
- // Don't tighten headers.
- }
}
class Block_heading_wikicreole extends BlockMarkup
@@ -1255,10 +1246,6 @@
return true;
}
-
- function _setTightness($top, $bot) {
- // Don't tighten headers.
- }
}
class Block_p extends BlockMarkup
@@ -1345,12 +1332,8 @@
}
}
$this->_element = new Block_HtmlElement($tag, $args, $content);
- //$this->_element->setTightness($tag == 'span', $tag == 'span');
return true;
}
- function _setTightness($top, $bot) {
- // Don't tighten user <div|span>
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2009-09-05 10:48:36
|
Revision: 7099
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7099&view=rev
Author: vargenau
Date: 2009-09-05 10:48:26 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
More tags: thead, tfoot, tbody, th, sub, sup
Modified Paths:
--------------
trunk/lib/plugin/RawHtml.php
Modified: trunk/lib/plugin/RawHtml.php
===================================================================
--- trunk/lib/plugin/RawHtml.php 2009-09-01 11:40:33 UTC (rev 7098)
+++ trunk/lib/plugin/RawHtml.php 2009-09-05 10:48:26 UTC (rev 7099)
@@ -189,8 +189,8 @@
if ($allowedtags=="") {
$allowedtags= array ( "p"=>1, "br"=>0, "a"=>1, "img"=>0, "li"=>1,
"ol"=>1, "ul"=>1, "b"=>1, "i"=>1, "em"=>1, "strong"=>1, "del"=>1, "ins"=>1,
- "u"=>1, "blockquote"=>1, "pre"=>1, "hr"=>0,
- "table"=>1, "tr"=>1, "td"=>1,
+ "sub"=>1, "sup"=>1, "u"=>1, "blockquote"=>1, "pre"=>1, "hr"=>0,
+ "table"=>1, "thead"=>1, "tfoot"=>1, "tbody"=>1, "tr"=>1, "td"=>1, "th"=>1,
);
}
elseif (!is_array($allowedtags)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2009-09-01 11:40:45
|
Revision: 7098
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7098&view=rev
Author: rurban
Date: 2009-09-01 11:40:33 +0000 (Tue, 01 Sep 2009)
Log Message:
-----------
Declare locals
anonymous function does not always return a value
Modified Paths:
--------------
trunk/themes/default/sortable.js
Modified: trunk/themes/default/sortable.js
===================================================================
--- trunk/themes/default/sortable.js 2009-09-01 11:38:52 UTC (rev 7097)
+++ trunk/themes/default/sortable.js 2009-09-01 11:40:33 UTC (rev 7098)
@@ -242,15 +242,15 @@
return compare_numeric(aa,bb);
}
function compare_numeric(a,b) {
- var a = parseFloat(a);
- a = (isNaN(a) ? 0 : a);
- var b = parseFloat(b);
- b = (isNaN(b) ? 0 : b);
- return a - b;
+ var aa = parseFloat(a);
+ aa = (isNaN(aa) ? 0 : aa);
+ var bb = parseFloat(b);
+ bb = (isNaN(bb) ? 0 : bb);
+ return aa - bb;
}
function ts_sort_caseinsensitive(a,b) {
- aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]).toLowerCase();
- bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]).toLowerCase();
+ var aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]).toLowerCase();
+ var bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]).toLowerCase();
if (aa==bb) {
return 0;
}
@@ -260,8 +260,8 @@
return 1;
}
function ts_sort_default(a,b) {
- aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
- bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
+ var aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
+ var bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
if (aa==bb) {
return 0;
}
@@ -283,6 +283,7 @@
return r;
} else {
alert("Handler could not be removed");
+ return false;
}
}
function clean_num(str) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2009-09-01 11:39:00
|
Revision: 7097
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7097&view=rev
Author: rurban
Date: 2009-09-01 11:38:52 +0000 (Tue, 01 Sep 2009)
Log Message:
-----------
fix indentation
Modified Paths:
--------------
trunk/themes/default/moacdropdown/js/modomext.js
Modified: trunk/themes/default/moacdropdown/js/modomext.js
===================================================================
--- trunk/themes/default/moacdropdown/js/modomext.js 2009-09-01 11:38:07 UTC (rev 7096)
+++ trunk/themes/default/moacdropdown/js/modomext.js 2009-09-01 11:38:52 UTC (rev 7097)
@@ -18,7 +18,7 @@
this.hInitFunction = hInitFunction
}
-cDomExtensionManager =
+var cDomExtensionManager =
{
aExtensions : new Array()
}
@@ -149,44 +149,44 @@
switch( aSelectorData[ 2 ] )
{
case '.' : if( hGroup[ nI ].className == aSelectorData[ 3 ] )
- {
- hInitFunction( hGroup[ nI ] )
- }
- break
+ {
+ hInitFunction( hGroup[ nI ] )
+ }
+ break
case '#' : if( hGroup[ nI ].id == aSelectorData[ 3 ] )
- {
- hInitFunction( hGroup[ nI ] )
- }
- break
+ {
+ hInitFunction( hGroup[ nI ] )
+ }
+ break
case '@' : aAttributeData = hAttributeRegEx.exec( aSelectorData[ 3 ] )
- sAttribute = hGroup[ nI ].getAttribute( aAttributeData[ 1 ] )
- if( sAttribute != null && sAttribute.length > 0 )
- {
- if( aAttributeData[ 3 ] != '' )
+ sAttribute = hGroup[ nI ].getAttribute( aAttributeData[ 1 ] )
+ if( sAttribute != null && sAttribute.length > 0 )
+ {
+ if( aAttributeData[ 3 ] != '' )
+ {
+ if( aAttributeData[ 2 ] == '=' )
{
- if( aAttributeData[ 2 ] == '=' )
+ if( sAttribute == aAttributeData[ 3 ] )
{
- if( sAttribute == aAttributeData[ 3 ] )
- {
- hInitFunction( hGroup[ nI ] )
- }
+ hInitFunction( hGroup[ nI ] )
}
- else /* the case is like ~ */
+ }
+ else /* the case is like ~ */
+ {
+ if( sAttribute.indexOf( aAttributeData[ 3 ] ) >= 0 )
{
- if( sAttribute.indexOf( aAttributeData[ 3 ] ) >= 0 )
- {
- hInitFunction( hGroup[ nI ] )
- }
+ hInitFunction( hGroup[ nI ] )
}
}
- else
- {
- hInitFunction( hGroup[ nI ] )
- }
}
- break
+ else
+ {
+ hInitFunction( hGroup[ nI ] )
+ }
+ }
+ break
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2009-09-01 11:38:14
|
Revision: 7096
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7096&view=rev
Author: rurban
Date: 2009-09-01 11:38:07 +0000 (Tue, 01 Sep 2009)
Log Message:
-----------
Support xmlrpc start_debug (Zend Debugger): enable js debugging then
Modified Paths:
--------------
trunk/themes/default/moacdropdown/js/acdropdown.js
trunk/themes/default/templates/search.tmpl
Modified: trunk/themes/default/moacdropdown/js/acdropdown.js
===================================================================
--- trunk/themes/default/moacdropdown/js/acdropdown.js 2009-08-31 11:28:47 UTC (rev 7095)
+++ trunk/themes/default/moacdropdown/js/acdropdown.js 2009-09-01 11:38:07 UTC (rev 7096)
@@ -128,8 +128,9 @@
cAutocomplete.prototype.init = function( sInputId )
{
- this.bDebug = false
- /*this.bDebug = true*/
+ /*this.bDebug = false*/
+ /*this.bDebug = true*/
+ this.bDebug = true
this.sInputId = sInputId
this.sListId = cAutocomplete.CS_LIST_PREFIX + sInputId
@@ -673,14 +674,14 @@
sStartWith = sStartWith.replace( /\s$/, '' )
if( sMethodName.indexOf( '?' ) > 0 )
- {
+ {
sMethodName = sMethodName.replace( '/^.+\?/', '' )
sURL = sURL.replace( '/\?.+$/', '' )
- }
+ }
else
- {
+ {
sURL = xmlrpc_url
- }
+ }
if (sMethodName.length < 1)
{
@@ -701,26 +702,30 @@
{
sRequest += '<params>\n'
for( var nI = 1; nI < aMethodArgs.length; nI++ )
- {
+ {
var sArg = aMethodArgs[ nI ];
//this.debug('sMethodName: "'+sMethodName+'" sArg['+nI+']: "'+sArg+'"')
if( sArg.indexOf( '[S]' ) >= 0 )
- {
+ {
//this.debug('sArg['+nI+']: "'+sArg+'" sStartWith: "'+sStartWith+'"')
sArg = sArg.replace( '[S]', sStartWith )
- }
+ }
// We could parse a prepended "(int)" cast.
// Can only do string args so far
- sRequest += '<param><value><string>'
- sRequest += sArg
- sRequest += '</string></value></param>\n'
- }
+ if (sArg == 'debug') {
+ this.bDebug = true;
+ } else {
+ sRequest += '<param><value><string>'
+ sRequest += sArg
+ sRequest += '</string></value></param>\n'
+ }
+ }
sRequest += '</params>\n'
}
sRequest += '</methodCall>'
if (this.bDebug) {
+ sURL += '?start_debug=1'
this.debug('url: "'+sURL+'" sRequest: "'+sRequest.substring(20)+'"')
- /*sURL += '?start_debug=1'*/
}
this.hXMLHttp.open( 'POST', sURL, true )
var hAC = this
@@ -1366,7 +1371,11 @@
var hContainer = document.createElement( 'DIV' )
hContainer.className = 'debug'
hContainer.innerHTML = s
- hInput.form.appendChild( hContainer )
+ var hDiv = hInput.form.parentNode
+ /*if (hDiv.childNodes[1] && hDiv.childNodes[1].className == 'debug')
+ hDiv.insertBefore( hContainer, hDiv.childNodes[1] )
+ else*/
+ hDiv.appendChild( hContainer )
/*alert(s)*/
}
}
@@ -1448,22 +1457,22 @@
if( hInput.form )
{
hInput.form.bLocked = true
- if (hAC.bDebug) { hAC.debug ("onInputKeyDown form blocked") }
+ //if (hAC.bDebug) { hAC.debug ("onInputKeyDown form blocked") }
}
if ( hEvent.keyCode == 13 || hEvent.keyCode == 27 || hEvent.keyCode == 38 || hEvent.keyCode == 40 )
{
if( hEvent.preventDefault )
{
hEvent.preventDefault()
- /*
- if (hEvent.keyCode == 13) {
- if (hAC.bDebug) { hAC.debug ("preventDefault: return true") }
- return true
- }
- */
} else {
if (hAC.bDebug) { hAC.debug ("no preventDefault return false") }
}
+ if (hEvent.keyCode == 13) {
+ /*if (hAC.bDebug) { hAC.debug ("Enter") }*/
+ hEvent.cancelBubble = true
+ hEvent.returnValue = true
+ return true
+ }
hEvent.cancelBubble = true
hEvent.returnValue = false
return false
@@ -1527,11 +1536,13 @@
{
hEvent.preventDefault()
}
- /*
- if (hEvent.keyCode == 13) {
- return true
- }
- */
+ if (hEvent.keyCode == 13) {
+ if (hAC.bDebug) { hAC.debug ("Enter KeyUp: returnValue = true") }
+ hEvent.cancelBubble = true
+ hEvent.returnValue = true
+ hInput.form.submit;
+ return true
+ }
if (hAC.bDebug) { hAC.debug ("keyUp: hEvent.returnValue = false") }
hEvent.cancelBubble = true
hEvent.returnValue = false
Modified: trunk/themes/default/templates/search.tmpl
===================================================================
--- trunk/themes/default/templates/search.tmpl 2009-08-31 11:28:47 UTC (rev 7095)
+++ trunk/themes/default/templates/search.tmpl 2009-09-01 11:38:07 UTC (rev 7096)
@@ -20,7 +20,7 @@
class="dropdown" id="searchInput" title="<?=_("LiveSearch") . " [$p-f]"?>"
style="width:115px;"
acdropdown="true" autocomplete_complete="false" autocomplete_matchsubstring="false"
- autocomplete_list="xmlrpc:wiki.titleSearch [S] 4" />
+ autocomplete_list="xmlrpc:wiki.titleSearch [S] 4<?= $request->getArg("start_debug") ? " debug" : "" ?>" />
<?php } elseif (ENABLE_LIVESEARCH) { ?>
type="text" id="livesearch" title="<?=_("LiveSearch") . " [$p-f]"?>"
onKeypress="liveSearchStart()"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2009-08-31 11:28:53
|
Revision: 7095
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7095&view=rev
Author: rurban
Date: 2009-08-31 11:28:47 +0000 (Mon, 31 Aug 2009)
Log Message:
-----------
cleanup: delete references to emailVerified
Modified Paths:
--------------
trunk/lib/WikiUser/OpenID.php
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php 2009-08-31 11:28:08 UTC (rev 7094)
+++ trunk/lib/WikiUser/OpenID.php 2009-08-31 11:28:47 UTC (rev 7095)
@@ -1,6 +1,6 @@
<?php //-*-php-*-
rcs_id('$Id$');
-/* Copyright (C) 2007 ReiniUrban
+/* Copyright (C) 2007,2009 ReiniUrban
* This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
*
* See http://openid.net/specs/openid-authentication-1_1.html
@@ -29,11 +29,13 @@
return $this->_tryNextUser();
}
$this->_authmethod = 'OpenID';
- // check the prefs for emailVerified
- if ($this->_prefs->get('emailVerified'))
- return true;
return $this->_tryNextUser();
}
+ // no quotes and shorter than 128
+ function isValidName() {
+ if (!$this->_userid) return false;
+ return !preg_match('/[\"\']/', $this->_userid) and strlen($this->_userid) < 128;
+ }
}
// Local Variables:
@@ -43,4 +45,4 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2009-08-31 11:28:15
|
Revision: 7094
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7094&view=rev
Author: rurban
Date: 2009-08-31 11:28:08 +0000 (Mon, 31 Aug 2009)
Log Message:
-----------
Warn about fixed invalid image links
Modified Paths:
--------------
trunk/lib/stdlib.php
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2009-08-31 11:21:07 UTC (rev 7093)
+++ trunk/lib/stdlib.php 2009-08-31 11:28:08 UTC (rev 7094)
@@ -475,7 +475,7 @@
}
}
else {
- trigger_error(sprintf(_("Invalid image attribute %s %s=%s"),
+ trigger_error(sprintf(_("Invalid image attribute \"%s\" %s=%s"),
$url, $attr, $value), E_USER_WARNING);
}
}
@@ -485,10 +485,15 @@
$file = NormalizeLocalFileName($ori_url);
if (file_exists($file)) {
$link = HTML::img(array('src' => $ori_url));
+ trigger_error(
+ sprintf(_("Invalid image link fixed %s => %s. Spaces must be quoted with %%20."),
+ $url, $ori_url), E_USER_WARNING);
} elseif (string_starts_with($ori_url, getUploadDataPath())) {
$file = substr($file, strlen(getUploadDataPath()));
$path = getUploadFilePath().$file;
if (file_exists($path)) {
+ trigger_error(sprintf(_("Invalid image link fixed \"%s\" => \"%s\".\n Spaces must be quoted with %%20."),
+ $url, $ori_url), E_USER_WARNING);
$link->setAttr('src', getUploadDataPath() . $file);
$url = $ori_url;
}
@@ -554,7 +559,7 @@
$link->setAttr('class', 'inlineimage');
/* Check for inlined objects. Everything allowed in INLINE_IMAGES besides
- * png|jpg|gif|jpeg|bmp|pl|cgi
+ * png|jpg|gif|jpeg|bmp|pl|cgi. If no image it is an object to embed.
* Note: Allow cgi's (pl,cgi) returning images.
*/
if (!preg_match("/\.(".$force_img.")/i", $url)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2009-08-31 11:21:15
|
Revision: 7093
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7093&view=rev
Author: rurban
Date: 2009-08-31 11:21:07 +0000 (Mon, 31 Aug 2009)
Log Message:
-----------
fix wrong paging with cols.
ol start value (listtype=ol) not yet stable
Modified Paths:
--------------
trunk/lib/PageList.php
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2009-08-31 10:58:59 UTC (rev 7092)
+++ trunk/lib/PageList.php 2009-08-31 11:21:07 UTC (rev 7093)
@@ -1527,15 +1527,15 @@
if (empty($this->_pages)) return; // stop recursion
if (!isset($this->_options['listtype']))
$this->_options['listtype'] = '';
- $nb_row = 0;
- foreach ($this->_pages as $pagenum => $page) {
- $one_row = $this->_renderPageRow($page);
+ $nb_row = 0;
+ foreach ($this->_pages as $pagenum => $page) {
+ $one_row = $this->_renderPageRow($page);
$rows[] = array('header' => WikiLink($page), 'render' => $one_row);
if ($one_row) $nb_row++;
- }
+ }
$out = HTML();
if ($caption) {
- $caption = preg_replace('/{total}/', $nb_row, asString($caption));
+ $caption = preg_replace('/{total}/', $nb_row, asString($caption));
$out->pushContent(HTML::p($caption));
}
// Semantic Search et al: only unique list entries, esp. with nopage
@@ -1558,9 +1558,13 @@
}
}
+ if (!empty($this->_options['limit']))
+ list($offset, $count) = $this->limit($this->_options['limit']);
+ else {
+ $offset = 0; $count = count($this->_pages);
+ }
// need a recursive switch here for the azhead and cols grouping.
if (!empty($this->_options['cols']) and $this->_options['cols'] > 1) {
- $count = count($this->_pages);
$length = intval($count / ($this->_options['cols']));
// If division does not give an integer, we need one more line
// E.g. 13 pages to display in 3 columns.
@@ -1569,7 +1573,7 @@
}
$width = sprintf("%d", 100 / $this->_options['cols']).'%';
$cols = HTML::tr(array('valign' => 'top'));
- for ($i=0; $i < $count; $i += $length) {
+ for ($i=$offset; $i < $offset+$count; $i += $length) {
$this->_saveOptions(array('cols' => 0, 'paging' => 'none'));
$this->_pages = array_slice($this->_pages, $i, $length);
$cols->pushContent(HTML::td(/*array('width' => $width),*/
@@ -1577,9 +1581,10 @@
$this->_restoreOptions();
}
// speed up table rendering by defining colgroups
- $out->pushContent(HTML::table(HTML::colgroup(array('span' => $this->_options['cols'],
- 'width' => $width)),
- $cols));
+ $out->pushContent(HTML::table(HTML::colgroup
+ (array('span' => $this->_options['cols'],
+ 'width' => $width)),
+ $cols));
return $out;
}
@@ -1596,7 +1601,7 @@
$page =& $this->_pages[$i];
$h = substr($page->getName(), 0, 1);
if ($h != $cur_h and $i > $j) {
- $this->_saveOptions(array('cols' => 0, 'azhead' => 0));
+ $this->_saveOptions(array('cols' => 0, 'azhead' => 0, 'ordered' => $j+1));
$this->_pages = array_slice($this->_pages, $j, $i - $j);
$out->pushContent($this->_generateList());
$this->_restoreOptions();
@@ -1606,7 +1611,7 @@
}
}
if ($i > $j) { // flush the rest
- $this->_saveOptions(array('cols' => 0, 'azhead' => 0));
+ $this->_saveOptions(array('cols' => 0, 'azhead' => 0, 'ordered' => $j+1));
$this->_pages = array_slice($this->_pages, $j, $i - $j);
$out->pushContent($this->_generateList());
$this->_restoreOptions();
@@ -1624,13 +1629,16 @@
return $out;
}
- if ($this->_options['listtype'] == 'ol')
- $this->_options['ordered'] = 1;
- elseif ($this->_options['listtype'] == 'ul')
+ if ($this->_options['listtype'] == 'ol') {
+ if (empty($this->_options['ordered'])) {
+ $this->_options['ordered'] = $offset+1;
+ }
+ } elseif ($this->_options['listtype'] == 'ul')
$this->_options['ordered'] = 0;
- if (!empty($this->_options['ordered']))
- $list = HTML::ol(array('class' => 'pagelist'));
- elseif ($this->_options['listtype'] == 'dl') {
+ if ($this->_options['listtype'] == 'ol' and !empty($this->_options['ordered'])) {
+ $list = HTML::ol(array('class' => 'pagelist',
+ 'start' => $this->_options['ordered']));
+ } elseif ($this->_options['listtype'] == 'dl') {
$list = HTML::dl(array('class' => 'pagelist'));
} else {
$list = HTML::ul(array('class' => 'pagelist'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
286 messages has been excluded from this view by a project administrator.
