ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=1148adb6bfb9f1f04bf57fe0aa9d27cc4f474a4c
commit 1148adb6bfb9f1f04bf57fe0aa9d27cc4f474a4c Author: Andy Williams <[email protected]> Date: Wed Nov 29 11:30:57 2017 +0000 plugins: Remove unused list plugin as it conflicts with other plugins --- public_html/lib/plugins/yalist/.travis.yml | 30 - public_html/lib/plugins/yalist/LICENSE | 339 ------------ public_html/lib/plugins/yalist/README.md | 27 - public_html/lib/plugins/yalist/conf/default.php | 7 - public_html/lib/plugins/yalist/conf/metadata.php | 8 - public_html/lib/plugins/yalist/odt.css | 7 - public_html/lib/plugins/yalist/plugin.info.txt | 7 - public_html/lib/plugins/yalist/print.css | 37 -- public_html/lib/plugins/yalist/style.css | 31 -- public_html/lib/plugins/yalist/syntax.php | 674 ----------------------- 10 files changed, 1167 deletions(-) diff --git a/public_html/lib/plugins/yalist/.travis.yml b/public_html/lib/plugins/yalist/.travis.yml deleted file mode 100644 index 66b3dff5..00000000 --- a/public_html/lib/plugins/yalist/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -dist: trusty -language: php - -php: - - "nightly" - - "7.1" - - "7.0" - - "5.6" - - "hhvm" - -matrix: - allow_failures: - - php: "hhvm" - - php: "nightly" - env: DOKUWIKI=stable - - php: "7.1" - env: DOKUWIKI=stable - -env: - - DOKUWIKI=master - - DOKUWIKI=stable - -before_install: - - wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh - -install: - - sh travis.sh - -script: - - cd _test && PRESERVE_TMP=false phpunit --stderr --group plugin_backlinks --verbose --debug diff --git a/public_html/lib/plugins/yalist/LICENSE b/public_html/lib/plugins/yalist/LICENSE deleted file mode 100644 index 22fbe5db..00000000 --- a/public_html/lib/plugins/yalist/LICENSE +++ /dev/null @@ -1,339 +0,0 @@ -GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/> - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {description} - Copyright (C) {year} {fullname} - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - {signature of Ty Coon}, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. \ No newline at end of file diff --git a/public_html/lib/plugins/yalist/README.md b/public_html/lib/plugins/yalist/README.md deleted file mode 100644 index 02fed24d..00000000 --- a/public_html/lib/plugins/yalist/README.md +++ /dev/null @@ -1,27 +0,0 @@ -dokuwiki-yalist-plugin -====================== - -This plugin extends DokuWiki's list markup syntax to allow definition lists -and list items with multiple paragraphs. The complete syntax is as follows: - -``` - - ordered list item [<ol><li>] <!-- as standard syntax --> - * unordered list item [<ul><li>] <!-- as standard syntax --> - ? definition list term [<dl><dt>] - : definition list definition [<dl><dd>] - - -- ordered list item w/ multiple paragraphs - ** unordered list item w/ multiple paragraphs - :: definition list definition w/multiple paragraphs - .. new paragraph in --, **, or :: -``` - -Lists can be nested within lists, just as in the standard DokuWiki syntax. - - -[](https://travis-ci.org/mprins/dokuwiki-yalist-plugin) -[](https://scrutinizer-ci.com/g/mprins/dokuwiki-yalist-plugin/?branch=master) -[](https://github.com/mprins/dokuwiki-yalist-plugin/issues) -[](https://github.com/mprins/dokuwiki-yalist-plugin/network) -[](https://github.com/mprins/dokuwiki-yalist-plugin/stargazers) -[](https://raw.githubusercontent.com/mprins/dokuwiki-yalist-plugin/master/LICENSE) diff --git a/public_html/lib/plugins/yalist/conf/default.php b/public_html/lib/plugins/yalist/conf/default.php deleted file mode 100644 index 7e9a0861..00000000 --- a/public_html/lib/plugins/yalist/conf/default.php +++ /dev/null @@ -1,7 +0,0 @@ -<?php -/** - * @author LarsDW223 - */ - -// How shall definition lists be exported to ODT? -$conf['def_list_odt_export'] = 'list'; diff --git a/public_html/lib/plugins/yalist/conf/metadata.php b/public_html/lib/plugins/yalist/conf/metadata.php deleted file mode 100644 index 5d612a5d..00000000 --- a/public_html/lib/plugins/yalist/conf/metadata.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -/** - * Options for the yalist plugin - * - * @author LarsDW223 - */ - -$meta['def_list_odt_export'] = array('multichoice', '_choices' => array('list', 'listheader', 'table')); diff --git a/public_html/lib/plugins/yalist/odt.css b/public_html/lib/plugins/yalist/odt.css deleted file mode 100644 index 1023b75d..00000000 --- a/public_html/lib/plugins/yalist/odt.css +++ /dev/null @@ -1,7 +0,0 @@ -div.dokuwiki .dt { - margin-right: 1em; - color: __text_alt__; - font-weight: bold; - max-width: 30%; - float: left; -} diff --git a/public_html/lib/plugins/yalist/plugin.info.txt b/public_html/lib/plugins/yalist/plugin.info.txt deleted file mode 100644 index 81501cc2..00000000 --- a/public_html/lib/plugins/yalist/plugin.info.txt +++ /dev/null @@ -1,7 +0,0 @@ -base yalist -author Mark C. Prins, previously Ben Slusky -email [email protected] -date 2016-08-29 -name Simple universal list plugin -desc Extend DokuWiki list syntax to allow definition list and multiple paragraphs in a list entry -url https://www.dokuwiki.org/plugin:yalist diff --git a/public_html/lib/plugins/yalist/print.css b/public_html/lib/plugins/yalist/print.css deleted file mode 100644 index 3f47bf3e..00000000 --- a/public_html/lib/plugins/yalist/print.css +++ /dev/null @@ -1,37 +0,0 @@ -div.dokuwiki dl { - margin-bottom: 0.5em; - padding: 0; -} - -div.dokuwiki dt { - clear: left; -} - -div.dokuwiki .dt { - margin-right: 1em; - font-weight: bold; - max-width: 30%; - float: left; -} - -div.dokuwiki .dt, -div.dokuwiki .dd, -div.dokuwiki .li { - margin-bottom: 0.33em; -} - -div.dokuwiki dd { - margin-left: 3em; -} - -div.dokuwiki dl:after, -div.dokuwiki dl dl:before, -div.dokuwiki dl ol:before, -div.dokuwiki dl ul:before { - content: '.'; - display: block; - clear: left; - width: 0; - height: 0; - visibility: hidden; -} diff --git a/public_html/lib/plugins/yalist/style.css b/public_html/lib/plugins/yalist/style.css deleted file mode 100644 index c30b734e..00000000 --- a/public_html/lib/plugins/yalist/style.css +++ /dev/null @@ -1,31 +0,0 @@ -div.dokuwiki dl { - margin-bottom: 0.5em; -} - -div.dokuwiki dt { - clear: left; -} - -div.dokuwiki .dt { - margin-right: 1em; - color: __text_alt__; - font-weight: bold; - max-width: 30%; - float: left; -} - -div.dokuwiki dd { - margin-left: 3em; -} - -div.dokuwiki dl:after, -div.dokuwiki dl dl:before, -div.dokuwiki dl ol:before, -div.dokuwiki dl ul:before { - content: '.'; - display: block; - clear: left; - width: 0; - height: 0; - visibility: hidden; -} diff --git a/public_html/lib/plugins/yalist/syntax.php b/public_html/lib/plugins/yalist/syntax.php deleted file mode 100644 index 7304e318..00000000 --- a/public_html/lib/plugins/yalist/syntax.php +++ /dev/null @@ -1,674 +0,0 @@ -<?php -/* - * This plugin extends DokuWiki's list markup syntax to allow definition lists - * and list items with multiple paragraphs. The complete syntax is as follows: - * - * - * - ordered list item [<ol><li>] <!-- as standard syntax --> - * * unordered list item [<ul><li>] <!-- as standard syntax --> - * ? definition list term [<dl><dt>] - * : definition list definition [<dl><dd>] - * - * -- ordered list item w/ multiple paragraphs - * ** unordered list item w/ multiple paragraphs - * :: definition list definition w/multiple paragraphs - * .. new paragraph in --, **, or :: - * - * - * Lists can be nested within lists, just as in the standard DokuWiki syntax. - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author Ben Slusky <[email protected]> - * - */ -if (!defined('DOKU_INC')) { - define('DOKU_INC', realpath(dirname(__FILE__) . '/../../') . '/'); -} -if (!defined('DOKU_PLUGIN')) { - define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/'); -} -require_once(DOKU_PLUGIN . 'syntax.php'); -class syntax_plugin_yalist extends DokuWiki_Syntax_Plugin { - var $stack = array(); - static $odt_table_stack = array(); - static $odt_table_stack_index = 0; - - function getType() { - return 'container'; - } - function getSort() { - // just before listblock (10) - return 9; - } - function getPType() { - return 'block'; - } - function getAllowedTypes() { - return array('substition', 'protected', 'disabled', 'formatting'); - } - function connectTo($mode) { - $this->Lexer->addEntryPattern('\n {2,}(?:--?|\*\*?|\?|::?)', $mode, 'plugin_yalist'); - $this->Lexer->addEntryPattern('\n\t{1,}(?:--?|\*\*?|\?|::?)', $mode, 'plugin_yalist'); - $this->Lexer->addPattern('\n {2,}(?:--?|\*\*?|\?|::?|\.\.)', 'plugin_yalist'); - $this->Lexer->addPattern('\n\t{1,}(?:--?|\*\*?|\?|::?|\.\.)', 'plugin_yalist'); - } - function postConnect() { - $this->Lexer->addExitPattern('\n', 'plugin_yalist'); - } - function handle($match, $state, $pos, Doku_Handler $handler) { - $output = array(); - $level = 0; - switch ($state) { - case DOKU_LEXER_ENTER: - $frame = $this->_interpret_match($match); - $level = $frame['level'] = 1; - array_push($output, - "${frame['list']}_open", - "${frame['item']}_open", - "${frame['item']}_content_open"); - if ($frame['paras']) { - array_push($output, 'p_open'); - } - array_push($this->stack, $frame); - break; - case DOKU_LEXER_EXIT: - $close_content = true; - while ($frame = array_pop($this->stack)) { - // for the first frame we pop off the stack, we'll need to - // close the content tag; for the rest it will have been - // closed already - if ($close_content) { - if ($frame['paras']) { - array_push($output, 'p_close'); - } - array_push($output, "${frame['item']}_content_close"); - $close_content = false; - } - array_push($output, - "${frame['item']}_close", - "${frame['list']}_close"); - } - break; - case DOKU_LEXER_MATCHED: - $last_frame = end($this->stack); - if (substr($match, -2) == '..') { - // new paragraphs cannot be deeper than the current depth, - // but they may be shallower - $para_depth = count(explode(' ', str_replace("\t", ' ', $match))); - $close_content = true; - while ($para_depth < $last_frame['depth'] && count($this->stack) > 1) { - if ($close_content) { - if ($last_frame['paras']) { - array_push($output, 'p_close'); - } - array_push($output, "${last_frame['item']}_content_close"); - $close_content = false; - } - array_push($output, - "${last_frame['item']}_close", - "${last_frame['list']}_close"); - array_pop($this->stack); - $last_frame = end($this->stack); - } - if ($last_frame['paras']) { - if ($close_content) { - // depth did not change - array_push($output, 'p_close', 'p_open'); - } else { - array_push($output, - "${last_frame['item']}_content_open", - 'p_open'); - } - } else { - // let's just pretend we didn't match... - $state = DOKU_LEXER_UNMATCHED; - $output = $match; - } - break; - } - $curr_frame = $this->_interpret_match($match); - if ($curr_frame['depth'] > $last_frame['depth']) { - // going one level deeper - $level = $last_frame['level'] + 1; - if ($last_frame['paras']) { - array_push($output, 'p_close'); - } - array_push($output, - "${last_frame['item']}_content_close", - "${curr_frame['list']}_open"); - } else { - // same depth, or getting shallower - $close_content = true; - // keep popping frames off the stack until we find a frame - // that's at least as deep as this one, or until only the - // bottom frame (i.e. the initial list markup) remains - while ($curr_frame['depth'] < $last_frame['depth'] && - count($this->stack) > 1) - { - // again, we need to close the content tag only for - // the first frame popped off the stack - if ($close_content) { - if ($last_frame['paras']) { - array_push($output, 'p_close'); - } - array_push($output, "${last_frame['item']}_content_close"); - $close_content = false; - } - array_push($output, - "${last_frame['item']}_close", - "${last_frame['list']}_close"); - array_pop($this->stack); - $last_frame = end($this->stack); - } - // pull the last frame off the stack; - // it will be replaced by the current frame - array_pop($this->stack); - $level = $last_frame['level']; - if ($close_content) { - if ($last_frame['paras']) { - array_push($output, 'p_close'); - } - array_push($output, "${last_frame['item']}_content_close"); - $close_content = false; - } - array_push($output, "${last_frame['item']}_close"); - if ($curr_frame['list'] != $last_frame['list']) { - // change list types - array_push($output, - "${last_frame['list']}_close", - "${curr_frame['list']}_open"); - } - } - // and finally, open tags for the new list item - array_push($output, - "${curr_frame['item']}_open", - "${curr_frame['item']}_content_open"); - if ($curr_frame['paras']) { - array_push($output, 'p_open'); - } - $curr_frame['level'] = $level; - array_push($this->stack, $curr_frame); - break; - case DOKU_LEXER_UNMATCHED: - $output = $match; - break; - } - return array('state' => $state, 'output' => $output, 'level' => $level); - } - function _interpret_match($match) { - $tag_table = array( - '*' => 'u_li', - '-' => 'o_li', - '?' => 'dt', - ':' => 'dd', - ); - $tag = $tag_table[substr($match, -1)]; - return array( - 'depth' => count(explode(' ', str_replace("\t", ' ', $match))), - 'list' => substr($tag, 0, 1) . 'l', - 'item' => substr($tag, -2), - 'paras' => (substr($match, -1) == substr($match, -2, 1)), - ); - } - - function render($mode, Doku_Renderer $renderer, $data) { - if ($mode != 'xhtml' && $mode != 'latex' && $mode != 'odt') { - return false; - } - if ($data['state'] == DOKU_LEXER_UNMATCHED) { - if ($mode != 'odt') { - $renderer->doc .= $renderer->_xmlEntities($data['output']); - } else { - $renderer->cdata($data['output']); - } - return true; - } - foreach ($data['output'] as $i) { - switch ($mode) { - case 'xhtml': - $this->render_xhtml_item($renderer, $i, $data); - break; - case 'latex': - $this->render_latex_item($renderer, $i, $data); - break; - case 'odt': - $this->render_odt_item($renderer, $i, $data); - break; - } - } - if ($data['state'] == DOKU_LEXER_EXIT) { - if ($mode != 'odt') { - $renderer->doc .= "\n"; - } else { - $renderer->linebreak(); - } - } - return true; - } - - function render_xhtml_item(Doku_Renderer $renderer, $item) { - $markup = ''; - switch ($item) { - case 'ol_open': - $markup = "<ol>\n"; - break; - case 'ol_close': - $markup = "</ol>\n"; - break; - case 'ul_open': - $markup = "<ul>\n"; - break; - case 'ul_close': - $markup = "</ul>\n"; - break; - case 'dl_open': - $markup = "<dl>\n"; - break; - case 'dl_close': - $markup = "</dl>\n"; - break; - case 'li_open': - $markup = "<li class=\"level${data['level']}\">"; - break; - case 'li_content_open': - $markup = "<div class=\"li\">\n"; - break; - case 'li_content_close': - $markup = "\n</div>"; - break; - case 'li_close': - $markup = "</li>\n"; - break; - case 'dt_open': - $markup = "<dt class=\"level${data['level']}\">"; - break; - case 'dt_content_open': - $markup = "<span class=\"dt\">"; - break; - case 'dt_content_close': - $markup = "</span>"; - break; - case 'dt_close': - $markup = "</dt>\n"; - break; - case 'dd_open': - $markup = "<dd class=\"level${data['level']}\">"; - break; - case 'dd_content_open': - $markup = "<div class=\"dd\">\n"; - break; - case 'dd_content_close': - $markup = "\n</div>"; - break; - case 'dd_close': - $markup = "</dd>\n"; - break; - case 'p_open': - $markup = "<p>\n"; - break; - case 'p_close': - $markup = "\n</p>"; - break; - } - $renderer->doc .= $markup; - } - - function render_latex_item(Doku_Renderer $renderer, $item) { - $markup = ''; - switch ($item) { - case 'ol_open': - $markup = "\\begin{enumerate}\n"; - break; - case 'ol_close': - $markup = "\\end{enumerate}\n"; - break; - case 'ul_open': - $markup = "\\begin{itemize}\n"; - break; - case 'ul_close': - $markup = "\\end{itemize}\n"; - break; - case 'dl_open': - $markup = "\\begin{description}\n"; - break; - case 'dl_close': - $markup = "\\end{description}\n"; - break; - case 'li_open': - $markup = "\item "; - break; - case 'li_content_open': - break; - case 'li_content_close': - break; - case 'li_close': - $markup = "\n"; - break; - case 'dt_open': - $markup = "\item["; - break; - case 'dt_content_open': - break; - case 'dt_content_close': - break; - case 'dt_close': - $markup = "] "; - break; - case 'dd_open': - break; - case 'dd_content_open': - break; - case 'dd_content_close': - break; - case 'dd_close': - $markup = "\n"; - break; - case 'p_open': - $markup = "\n"; - break; - case 'p_close': - $markup = "\n"; - break; - } - $renderer->doc .= $markup; - } - - /** - * Render yalist items for ODT format - * - * @param Doku_Renderer $renderer The current renderer object - * @param string $item The item to render - * - * @author LarsDW223 - */ - function render_odt_item(Doku_Renderer $renderer, $item) { - switch ($item) { - case 'ol_open': - $renderer->listo_open(); - break; - case 'ul_open': - $renderer->listu_open(); - break; - case 'dl_open': - if ($this->getConf('def_list_odt_export') != 'table') { - $renderer->listu_open(); - } else { - $renderer->table_open(2); - } - self::$odt_table_stack [self::$odt_table_stack_index] = array(); - self::$odt_table_stack [self::$odt_table_stack_index]['itemOpen'] = false; - self::$odt_table_stack [self::$odt_table_stack_index]['dtState'] = 0; - self::$odt_table_stack [self::$odt_table_stack_index]['ddState'] = 0; - self::$odt_table_stack_index++; - break; - case 'ol_close': - case 'ul_close': - $renderer->list_close(); - break; - case 'dl_close': - $config = $this->getConf('def_list_odt_export'); - if ($config != 'table') { - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] != 2) { - if ($config == 'listheader' && method_exists($renderer, 'listheader_close')) { - $renderer->listheader_close(); - } else { - $renderer->listitem_close(); - } - } - self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0; - $renderer->list_close(); - } else { - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] == 0) { - $properties = array(); - $properties ['border'] = 'none'; - $renderer->_odtTableCellOpenUseProperties($properties); - $renderer->tablecell_close(); - } - self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0; - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { - $renderer->tablerow_close(1); - self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; - } - $renderer->table_close(); - } - if (self::$odt_table_stack_index > 0) { - self::$odt_table_stack_index--; - unset(self::$odt_table_stack [self::$odt_table_stack_index]); - } - break; - - case 'li_open': - $renderer->listitem_open(1); - break; - case 'li_content_open': - $renderer->listcontent_open(); - break; - case 'li_content_close': - $renderer->listcontent_close(); - break; - case 'li_close': - $renderer->listitem_close(); - break; - - case 'dt_open': // unconditional: DT tags can't contain paragraphs. That would not be legal XHTML. - switch ($this->getConf('def_list_odt_export')) { - case 'listheader': - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { - if (method_exists($renderer, 'listheader_close')) { - $renderer->listheader_close(); - } else { - $renderer->listitem_close(); - } - self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; - } - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { - if (method_exists($renderer, 'listheader_open')) { - $renderer->listheader_open(1); - } else { - $renderer->listitem_open(1); - } - self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; - } - break; - case 'table': - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] == 0) { - $properties = array(); - $properties ['border'] = 'none'; - $renderer->_odtTableCellOpenUseProperties($properties); - $renderer->tablecell_close(); - } - - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { - $renderer->tablerow_close(); - self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; - } - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { - $renderer->tablerow_open(1); - self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; - } - $properties = array(); - $properties ['border'] = 'none'; - $renderer->_odtTableCellOpenUseProperties($properties); - break; - default: - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { - $renderer->listitem_close(); - self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; - } - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { - $renderer->listitem_open(1); - self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; - } - break; - } - self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 1; - self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0; - break; - case 'dd_open': - switch ($this->getConf('def_list_odt_export')) { - case 'listheader': - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { - if (method_exists($renderer, 'listheader_open')) { - $renderer->listheader_open(1); - } else { - $renderer->listitem_open(1); - } - self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; - } - break; - case 'table': - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { - $renderer->tablerow_open(1); - self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; - } - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] == 1) { - $renderer->tablecell_close(); - } - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] == 0) { - $properties = array(); - $properties ['border'] = 'none'; - $renderer->_odtTableCellOpenUseProperties($properties); - $renderer->tablecell_close(); - } - - $properties = array(); - $properties ['border'] = 'none'; - $renderer->_odtTableCellOpenUseProperties($properties); - break; - default: - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { - $renderer->listitem_open(1); - self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; - } - break; - } - self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 0; - self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 1; - break; - case 'dt_content_open': - switch ($this->getConf('def_list_odt_export')) { - case 'table': - $renderer->p_open(); - break; - default: - $renderer->listcontent_open(); - break; - } - $this->renderODTOpenSpan($renderer); - break; - case 'dd_content_open': - switch ($this->getConf('def_list_odt_export')) { - case 'table': - $renderer->p_open(); - break; - default: - $renderer->listcontent_open(); - break; - } - break; - case 'dt_content_close': - $this->renderODTCloseSpan($renderer); - switch ($this->getConf('def_list_odt_export')) { - case 'table': - $renderer->p_close(); - break; - default: - $renderer->listcontent_close(); - break; - } - break; - case 'dd_content_close': - switch ($this->getConf('def_list_odt_export')) { - case 'table': - $renderer->p_close(); - break; - default: - $renderer->listcontent_close(); - break; - } - break; - case 'dt_close': - switch ($this->getConf('def_list_odt_export')) { - case 'listheader': - $renderer->linebreak(); - break; - case 'table': - $renderer->tablecell_close(); - self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 2; - break; - default: - $renderer->linebreak(); - break; - } - break; - - case 'dd_close': - switch ($this->getConf('def_list_odt_export')) { - case 'listheader': - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { - if (method_exists($renderer, 'listheader_close')) { - $renderer->listheader_close(); - } else { - $renderer->listitem_close(); - } - self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; - } - break; - case 'table': - $renderer->tablecell_close(); - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { - $renderer->tablerow_close(1); - self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; - } - break; - default: - if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { - $renderer->listitem_close(1); - self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; - } - break; - } - self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 0; - self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 2; - break; - - case 'p_open': - $renderer->p_open(); - break; - case 'p_close': - $renderer->p_close(); - break; - } - } - - /** - * Open ODT span for rendering of dt-content - * - * @param Doku_Renderer $renderer The current renderer object - * - * @author LarsDW223 - */ - function renderODTOpenSpan($renderer) { - $properties = array(); - - // Get CSS properties for ODT export. - $renderer->getODTProperties($properties, 'div', 'dokuwiki dt', NULL); - - $renderer->_odtSpanOpenUseProperties($properties); - } - - /** - * Close ODT span for rendering of dt-content - * - * @param Doku_Renderer $renderer The current renderer object - * - * @author LarsDW223 - */ - function renderODTCloseSpan($renderer) { - if (method_exists($renderer, '_odtSpanClose') === false) { - // Function is not supported by installed ODT plugin version, return. - return; - } - $renderer->_odtSpanClose(); - } -} --
