@@ -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; |