mprins /
dokuwiki-yalist-plugin
@@ -55,11 +55,11 @@ discard block |
||
| 55 | 55 | $output = array(); |
| 56 | 56 | $level = 0; |
| 57 | 57 | switch ($state) { |
| 58 | - case DOKU_LEXER_ENTER: |
|
| 59 | - $frame = $this->_interpret_match($match); |
|
| 60 | - $level = $frame['level'] = 1; |
|
| 61 | - array_push($output, |
|
| 62 | - "${frame['list']}_open", |
|
| 58 | + case DOKU_LEXER_ENTER: |
|
| 59 | + $frame = $this->_interpret_match($match); |
|
| 60 | + $level = $frame['level'] = 1; |
|
| 61 | + array_push($output, |
|
| 62 | + "${frame['list']}_open", |
|
| 63 | 63 | "${frame['item']}_open", |
| 64 | 64 | "${frame['item']}_content_open"); |
| 65 | 65 | if ($frame['paras']) |
@@ -445,181 +445,181 @@ discard block |
||
| 445 | 445 | |
| 446 | 446 | case 'dt_open': // unconditional: DT tags can't contain paragraphs. That would not be legal XHTML. |
| 447 | 447 | switch ($this->getConf('def_list_odt_export')) { |
| 448 | - case 'listheader': |
|
| 449 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 450 | - if (method_exists ($renderer, 'listheader_close')) { |
|
| 451 | - $renderer->listheader_close(); |
|
| 452 | - } else { |
|
| 453 | - $renderer->listitem_close(); |
|
| 448 | + case 'listheader': |
|
| 449 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 450 | + if (method_exists ($renderer, 'listheader_close')) { |
|
| 451 | + $renderer->listheader_close(); |
|
| 452 | + } else { |
|
| 453 | + $renderer->listitem_close(); |
|
| 454 | + } |
|
| 455 | + self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 454 | 456 | } |
| 455 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 456 | - } |
|
| 457 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 458 | - if (method_exists ($renderer, 'listheader_open')) { |
|
| 459 | - $renderer->listheader_open(1); |
|
| 460 | - } else { |
|
| 461 | - $renderer->listitem_open(1); |
|
| 457 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 458 | + if (method_exists ($renderer, 'listheader_open')) { |
|
| 459 | + $renderer->listheader_open(1); |
|
| 460 | + } else { |
|
| 461 | + $renderer->listitem_open(1); |
|
| 462 | + } |
|
| 463 | + self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 464 | + } |
|
| 465 | + break; |
|
| 466 | + case 'table': |
|
| 467 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] == 0) { |
|
| 468 | + $properties = array(); |
|
| 469 | + $properties ['border'] = 'none'; |
|
| 470 | + $renderer->_odtTableCellOpenUseProperties($properties); |
|
| 471 | + $renderer->tablecell_close(); |
|
| 472 | + } |
|
| 473 | + |
|
| 474 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 475 | + $renderer->tablerow_close(); |
|
| 476 | + self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 477 | + } |
|
| 478 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 479 | + $renderer->tablerow_open(1); |
|
| 480 | + self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 462 | 481 | } |
| 463 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 464 | - } |
|
| 465 | - break; |
|
| 466 | - case 'table': |
|
| 467 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] == 0) { |
|
| 468 | 482 | $properties = array(); |
| 469 | 483 | $properties ['border'] = 'none'; |
| 470 | 484 | $renderer->_odtTableCellOpenUseProperties($properties); |
| 471 | - $renderer->tablecell_close(); |
|
| 472 | - } |
|
| 473 | - |
|
| 474 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 475 | - $renderer->tablerow_close(); |
|
| 476 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 477 | - } |
|
| 478 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 479 | - $renderer->tablerow_open(1); |
|
| 480 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 481 | - } |
|
| 482 | - $properties = array(); |
|
| 483 | - $properties ['border'] = 'none'; |
|
| 484 | - $renderer->_odtTableCellOpenUseProperties($properties); |
|
| 485 | - break; |
|
| 486 | - default: |
|
| 487 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 488 | - $renderer->listitem_close(); |
|
| 489 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 490 | - } |
|
| 491 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 492 | - $renderer->listitem_open(1); |
|
| 493 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 494 | - } |
|
| 495 | - break; |
|
| 485 | + break; |
|
| 486 | + default: |
|
| 487 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 488 | + $renderer->listitem_close(); |
|
| 489 | + self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 490 | + } |
|
| 491 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 492 | + $renderer->listitem_open(1); |
|
| 493 | + self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 494 | + } |
|
| 495 | + break; |
|
| 496 | 496 | } |
| 497 | 497 | self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 1; |
| 498 | 498 | self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0; |
| 499 | 499 | break; |
| 500 | 500 | case 'dd_open': |
| 501 | 501 | switch ($this->getConf('def_list_odt_export')) { |
| 502 | - case 'listheader': |
|
| 503 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 504 | - if (method_exists ($renderer, 'listheader_open')) { |
|
| 505 | - $renderer->listheader_open(1); |
|
| 506 | - } else { |
|
| 507 | - $renderer->listitem_open(1); |
|
| 502 | + case 'listheader': |
|
| 503 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 504 | + if (method_exists ($renderer, 'listheader_open')) { |
|
| 505 | + $renderer->listheader_open(1); |
|
| 506 | + } else { |
|
| 507 | + $renderer->listitem_open(1); |
|
| 508 | + } |
|
| 509 | + self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 508 | 510 | } |
| 509 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 510 | - } |
|
| 511 | - break; |
|
| 512 | - case 'table': |
|
| 513 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 514 | - $renderer->tablerow_open(1); |
|
| 515 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 516 | - } |
|
| 517 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] == 1) { |
|
| 518 | - $renderer->tablecell_close(); |
|
| 519 | - } |
|
| 520 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] == 0) { |
|
| 511 | + break; |
|
| 512 | + case 'table': |
|
| 513 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 514 | + $renderer->tablerow_open(1); |
|
| 515 | + self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 516 | + } |
|
| 517 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] == 1) { |
|
| 518 | + $renderer->tablecell_close(); |
|
| 519 | + } |
|
| 520 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] == 0) { |
|
| 521 | + $properties = array(); |
|
| 522 | + $properties ['border'] = 'none'; |
|
| 523 | + $renderer->_odtTableCellOpenUseProperties($properties); |
|
| 524 | + $renderer->tablecell_close(); |
|
| 525 | + } |
|
| 526 | + |
|
| 521 | 527 | $properties = array(); |
| 522 | 528 | $properties ['border'] = 'none'; |
| 523 | 529 | $renderer->_odtTableCellOpenUseProperties($properties); |
| 524 | - $renderer->tablecell_close(); |
|
| 525 | - } |
|
| 526 | - |
|
| 527 | - $properties = array(); |
|
| 528 | - $properties ['border'] = 'none'; |
|
| 529 | - $renderer->_odtTableCellOpenUseProperties($properties); |
|
| 530 | - break; |
|
| 531 | - default: |
|
| 532 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 533 | - $renderer->listitem_open(1); |
|
| 534 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 535 | - } |
|
| 536 | - break; |
|
| 530 | + break; |
|
| 531 | + default: |
|
| 532 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 533 | + $renderer->listitem_open(1); |
|
| 534 | + self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 535 | + } |
|
| 536 | + break; |
|
| 537 | 537 | } |
| 538 | 538 | self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 0; |
| 539 | 539 | self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 1; |
| 540 | 540 | break; |
| 541 | 541 | case 'dt_content_open': |
| 542 | 542 | switch ($this->getConf('def_list_odt_export')) { |
| 543 | - case 'table': |
|
| 544 | - $renderer->p_open(); |
|
| 545 | - break; |
|
| 546 | - default: |
|
| 547 | - $renderer->listcontent_open(); |
|
| 548 | - break; |
|
| 543 | + case 'table': |
|
| 544 | + $renderer->p_open(); |
|
| 545 | + break; |
|
| 546 | + default: |
|
| 547 | + $renderer->listcontent_open(); |
|
| 548 | + break; |
|
| 549 | 549 | } |
| 550 | 550 | $this->renderODTOpenSpan($renderer); |
| 551 | 551 | break; |
| 552 | 552 | case 'dd_content_open': |
| 553 | 553 | switch ($this->getConf('def_list_odt_export')) { |
| 554 | - case 'table': |
|
| 555 | - $renderer->p_open(); |
|
| 556 | - break; |
|
| 557 | - default: |
|
| 558 | - $renderer->listcontent_open(); |
|
| 559 | - break; |
|
| 554 | + case 'table': |
|
| 555 | + $renderer->p_open(); |
|
| 556 | + break; |
|
| 557 | + default: |
|
| 558 | + $renderer->listcontent_open(); |
|
| 559 | + break; |
|
| 560 | 560 | } |
| 561 | 561 | break; |
| 562 | 562 | case 'dt_content_close': |
| 563 | 563 | $this->renderODTCloseSpan($renderer); |
| 564 | 564 | switch ($this->getConf('def_list_odt_export')) { |
| 565 | - case 'table': |
|
| 566 | - $renderer->p_close(); |
|
| 567 | - break; |
|
| 568 | - default: |
|
| 569 | - $renderer->listcontent_close(); |
|
| 570 | - break; |
|
| 565 | + case 'table': |
|
| 566 | + $renderer->p_close(); |
|
| 567 | + break; |
|
| 568 | + default: |
|
| 569 | + $renderer->listcontent_close(); |
|
| 570 | + break; |
|
| 571 | 571 | } |
| 572 | 572 | break; |
| 573 | 573 | case 'dd_content_close': |
| 574 | 574 | switch ($this->getConf('def_list_odt_export')) { |
| 575 | - case 'table': |
|
| 576 | - $renderer->p_close(); |
|
| 577 | - break; |
|
| 578 | - default: |
|
| 579 | - $renderer->listcontent_close(); |
|
| 580 | - break; |
|
| 575 | + case 'table': |
|
| 576 | + $renderer->p_close(); |
|
| 577 | + break; |
|
| 578 | + default: |
|
| 579 | + $renderer->listcontent_close(); |
|
| 580 | + break; |
|
| 581 | 581 | } |
| 582 | 582 | break; |
| 583 | 583 | case 'dt_close': |
| 584 | 584 | switch ($this->getConf('def_list_odt_export')) { |
| 585 | - case 'listheader': |
|
| 586 | - $renderer->linebreak(); |
|
| 587 | - break; |
|
| 588 | - case 'table': |
|
| 589 | - $renderer->tablecell_close(); |
|
| 590 | - self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 2; |
|
| 591 | - break; |
|
| 592 | - default: |
|
| 593 | - $renderer->linebreak(); |
|
| 594 | - break; |
|
| 585 | + case 'listheader': |
|
| 586 | + $renderer->linebreak(); |
|
| 587 | + break; |
|
| 588 | + case 'table': |
|
| 589 | + $renderer->tablecell_close(); |
|
| 590 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 2; |
|
| 591 | + break; |
|
| 592 | + default: |
|
| 593 | + $renderer->linebreak(); |
|
| 594 | + break; |
|
| 595 | 595 | } |
| 596 | 596 | break; |
| 597 | 597 | |
| 598 | 598 | case 'dd_close': |
| 599 | 599 | switch ($this->getConf('def_list_odt_export')) { |
| 600 | - case 'listheader': |
|
| 601 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 602 | - if (method_exists ($renderer, 'listheader_close')) { |
|
| 603 | - $renderer->listheader_close(); |
|
| 604 | - } else { |
|
| 605 | - $renderer->listitem_close(); |
|
| 600 | + case 'listheader': |
|
| 601 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 602 | + if (method_exists ($renderer, 'listheader_close')) { |
|
| 603 | + $renderer->listheader_close(); |
|
| 604 | + } else { |
|
| 605 | + $renderer->listitem_close(); |
|
| 606 | + } |
|
| 607 | + self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 606 | 608 | } |
| 607 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 608 | - } |
|
| 609 | - break; |
|
| 610 | - case 'table': |
|
| 611 | - $renderer->tablecell_close(); |
|
| 612 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 613 | - $renderer->tablerow_close(1); |
|
| 614 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 615 | - } |
|
| 616 | - break; |
|
| 617 | - default: |
|
| 618 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 619 | - $renderer->listitem_close(1); |
|
| 620 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 621 | - } |
|
| 622 | - break; |
|
| 609 | + break; |
|
| 610 | + case 'table': |
|
| 611 | + $renderer->tablecell_close(); |
|
| 612 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 613 | + $renderer->tablerow_close(1); |
|
| 614 | + self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 615 | + } |
|
| 616 | + break; |
|
| 617 | + default: |
|
| 618 | + if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 619 | + $renderer->listitem_close(1); |
|
| 620 | + self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 621 | + } |
|
| 622 | + break; |
|
| 623 | 623 | } |
| 624 | 624 | self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 0; |
| 625 | 625 | self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 2; |
@@ -401,26 +401,26 @@ discard block |
||
| 401 | 401 | case 'dl_close': |
| 402 | 402 | $config = $this->getConf('def_list_odt_export'); |
| 403 | 403 | if ($config != 'table') { |
| 404 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] != 2) { |
|
| 405 | - if ($config == 'listheader' && method_exists ($renderer, 'listheader_close')) { |
|
| 404 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] != 2) { |
|
| 405 | + if ($config == 'listheader' && method_exists($renderer, 'listheader_close')) { |
|
| 406 | 406 | $renderer->listheader_close(); |
| 407 | 407 | } else { |
| 408 | 408 | $renderer->listitem_close(); |
| 409 | 409 | } |
| 410 | 410 | } |
| 411 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0; |
|
| 411 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0; |
|
| 412 | 412 | $renderer->list_close(); |
| 413 | 413 | } else { |
| 414 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] == 0) { |
|
| 414 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] == 0) { |
|
| 415 | 415 | $properties = array(); |
| 416 | 416 | $properties ['border'] = 'none'; |
| 417 | 417 | $renderer->_odtTableCellOpenUseProperties($properties); |
| 418 | 418 | $renderer->tablecell_close(); |
| 419 | 419 | } |
| 420 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0; |
|
| 421 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 420 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0; |
|
| 421 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { |
|
| 422 | 422 | $renderer->tablerow_close(1); |
| 423 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 423 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; |
|
| 424 | 424 | } |
| 425 | 425 | $renderer->table_close(); |
| 426 | 426 | } |
@@ -446,78 +446,78 @@ discard block |
||
| 446 | 446 | case 'dt_open': // unconditional: DT tags can't contain paragraphs. That would not be legal XHTML. |
| 447 | 447 | switch ($this->getConf('def_list_odt_export')) { |
| 448 | 448 | case 'listheader': |
| 449 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 450 | - if (method_exists ($renderer, 'listheader_close')) { |
|
| 449 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { |
|
| 450 | + if (method_exists($renderer, 'listheader_close')) { |
|
| 451 | 451 | $renderer->listheader_close(); |
| 452 | 452 | } else { |
| 453 | 453 | $renderer->listitem_close(); |
| 454 | 454 | } |
| 455 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 455 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; |
|
| 456 | 456 | } |
| 457 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 458 | - if (method_exists ($renderer, 'listheader_open')) { |
|
| 457 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { |
|
| 458 | + if (method_exists($renderer, 'listheader_open')) { |
|
| 459 | 459 | $renderer->listheader_open(1); |
| 460 | 460 | } else { |
| 461 | 461 | $renderer->listitem_open(1); |
| 462 | 462 | } |
| 463 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 463 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; |
|
| 464 | 464 | } |
| 465 | 465 | break; |
| 466 | 466 | case 'table': |
| 467 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] == 0) { |
|
| 467 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] == 0) { |
|
| 468 | 468 | $properties = array(); |
| 469 | 469 | $properties ['border'] = 'none'; |
| 470 | 470 | $renderer->_odtTableCellOpenUseProperties($properties); |
| 471 | 471 | $renderer->tablecell_close(); |
| 472 | 472 | } |
| 473 | 473 | |
| 474 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 474 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { |
|
| 475 | 475 | $renderer->tablerow_close(); |
| 476 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 476 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; |
|
| 477 | 477 | } |
| 478 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 478 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { |
|
| 479 | 479 | $renderer->tablerow_open(1); |
| 480 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 480 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; |
|
| 481 | 481 | } |
| 482 | 482 | $properties = array(); |
| 483 | 483 | $properties ['border'] = 'none'; |
| 484 | 484 | $renderer->_odtTableCellOpenUseProperties($properties); |
| 485 | 485 | break; |
| 486 | 486 | default: |
| 487 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 487 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { |
|
| 488 | 488 | $renderer->listitem_close(); |
| 489 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 489 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; |
|
| 490 | 490 | } |
| 491 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 491 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { |
|
| 492 | 492 | $renderer->listitem_open(1); |
| 493 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 493 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; |
|
| 494 | 494 | } |
| 495 | 495 | break; |
| 496 | 496 | } |
| 497 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 1; |
|
| 498 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 0; |
|
| 497 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 1; |
|
| 498 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 0; |
|
| 499 | 499 | break; |
| 500 | 500 | case 'dd_open': |
| 501 | 501 | switch ($this->getConf('def_list_odt_export')) { |
| 502 | 502 | case 'listheader': |
| 503 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 504 | - if (method_exists ($renderer, 'listheader_open')) { |
|
| 503 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { |
|
| 504 | + if (method_exists($renderer, 'listheader_open')) { |
|
| 505 | 505 | $renderer->listheader_open(1); |
| 506 | 506 | } else { |
| 507 | 507 | $renderer->listitem_open(1); |
| 508 | 508 | } |
| 509 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 509 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; |
|
| 510 | 510 | } |
| 511 | 511 | break; |
| 512 | 512 | case 'table': |
| 513 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 513 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { |
|
| 514 | 514 | $renderer->tablerow_open(1); |
| 515 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 515 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; |
|
| 516 | 516 | } |
| 517 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] == 1) { |
|
| 517 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] == 1) { |
|
| 518 | 518 | $renderer->tablecell_close(); |
| 519 | 519 | } |
| 520 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] == 0) { |
|
| 520 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] == 0) { |
|
| 521 | 521 | $properties = array(); |
| 522 | 522 | $properties ['border'] = 'none'; |
| 523 | 523 | $renderer->_odtTableCellOpenUseProperties($properties); |
@@ -529,14 +529,14 @@ discard block |
||
| 529 | 529 | $renderer->_odtTableCellOpenUseProperties($properties); |
| 530 | 530 | break; |
| 531 | 531 | default: |
| 532 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === false) { |
|
| 532 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === false) { |
|
| 533 | 533 | $renderer->listitem_open(1); |
| 534 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = true; |
|
| 534 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = true; |
|
| 535 | 535 | } |
| 536 | 536 | break; |
| 537 | 537 | } |
| 538 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 0; |
|
| 539 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 1; |
|
| 538 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 0; |
|
| 539 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 1; |
|
| 540 | 540 | break; |
| 541 | 541 | case 'dt_content_open': |
| 542 | 542 | switch ($this->getConf('def_list_odt_export')) { |
@@ -598,31 +598,31 @@ discard block |
||
| 598 | 598 | case 'dd_close': |
| 599 | 599 | switch ($this->getConf('def_list_odt_export')) { |
| 600 | 600 | case 'listheader': |
| 601 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 602 | - if (method_exists ($renderer, 'listheader_close')) { |
|
| 601 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { |
|
| 602 | + if (method_exists($renderer, 'listheader_close')) { |
|
| 603 | 603 | $renderer->listheader_close(); |
| 604 | 604 | } else { |
| 605 | 605 | $renderer->listitem_close(); |
| 606 | 606 | } |
| 607 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 607 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; |
|
| 608 | 608 | } |
| 609 | 609 | break; |
| 610 | 610 | case 'table': |
| 611 | 611 | $renderer->tablecell_close(); |
| 612 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 612 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { |
|
| 613 | 613 | $renderer->tablerow_close(1); |
| 614 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 614 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; |
|
| 615 | 615 | } |
| 616 | 616 | break; |
| 617 | 617 | default: |
| 618 | - if (self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] === true) { |
|
| 618 | + if (self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] === true) { |
|
| 619 | 619 | $renderer->listitem_close(1); |
| 620 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['itemOpen'] = false; |
|
| 620 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['itemOpen'] = false; |
|
| 621 | 621 | } |
| 622 | 622 | break; |
| 623 | 623 | } |
| 624 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['dtState'] = 0; |
|
| 625 | - self::$odt_table_stack [self::$odt_table_stack_index-1]['ddState'] = 2; |
|
| 624 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['dtState'] = 0; |
|
| 625 | + self::$odt_table_stack [self::$odt_table_stack_index - 1]['ddState'] = 2; |
|
| 626 | 626 | break; |
| 627 | 627 | |
| 628 | 628 | case 'p_open': |
@@ -21,8 +21,12 @@ discard block |
||
| 21 | 21 | * @author Ben Slusky <[email protected]> |
| 22 | 22 | * |
| 23 | 23 | */ |
| 24 | -if (!defined('DOKU_INC')) define('DOKU_INC', realpath(dirname(__FILE__) . '/../../') . '/'); |
|
| 25 | -if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/'); |
|
| 24 | +if (!defined('DOKU_INC')) { |
|
| 25 | + define('DOKU_INC', realpath(dirname(__FILE__) . '/../../') . '/'); |
|
| 26 | +} |
|
| 27 | +if (!defined('DOKU_PLUGIN')) { |
|
| 28 | + define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/'); |
|
| 29 | +} |
|
| 26 | 30 | require_once(DOKU_PLUGIN . 'syntax.php'); |
| 27 | 31 | class syntax_plugin_yalist extends DokuWiki_Syntax_Plugin { |
| 28 | 32 | var $stack = array(); |
@@ -62,8 +66,9 @@ discard block |
||
| 62 | 66 | "${frame['list']}_open", |
| 63 | 67 | "${frame['item']}_open", |
| 64 | 68 | "${frame['item']}_content_open"); |
| 65 | - if ($frame['paras']) |
|
| 66 | - array_push($output, 'p_open'); |
|
| 69 | + if ($frame['paras']) { |
|
| 70 | + array_push($output, 'p_open'); |
|
| 71 | + } |
|
| 67 | 72 | array_push($this->stack, $frame); |
| 68 | 73 | break; |
| 69 | 74 | case DOKU_LEXER_EXIT: |
@@ -106,13 +111,14 @@ discard block |
||
| 106 | 111 | $last_frame = end($this->stack); |
| 107 | 112 | } |
| 108 | 113 | if ($last_frame['paras']) { |
| 109 | - if ($close_content) |
|
| 110 | - // depth did not change |
|
| 114 | + if ($close_content) { |
|
| 115 | + // depth did not change |
|
| 111 | 116 | array_push($output, 'p_close', 'p_open'); |
| 112 | - else |
|
| 113 | - array_push($output, |
|
| 117 | + } else { |
|
| 118 | + array_push($output, |
|
| 114 | 119 | "${last_frame['item']}_content_open", |
| 115 | 120 | 'p_open'); |
| 121 | + } |
|
| 116 | 122 | } else { |
| 117 | 123 | // let's just pretend we didn't match... |
| 118 | 124 | $state = DOKU_LEXER_UNMATCHED; |
@@ -177,8 +183,9 @@ discard block |
||
| 177 | 183 | array_push($output, |
| 178 | 184 | "${curr_frame['item']}_open", |
| 179 | 185 | "${curr_frame['item']}_content_open"); |
| 180 | - if ($curr_frame['paras']) |
|
| 181 | - array_push($output, 'p_open'); |
|
| 186 | + if ($curr_frame['paras']) { |
|
| 187 | + array_push($output, 'p_open'); |
|
| 188 | + } |
|
| 182 | 189 | $curr_frame['level'] = $level; |
| 183 | 190 | array_push($this->stack, $curr_frame); |
| 184 | 191 | break; |
