Merge pull request #1560 from joebordes/hacktoberfest20233

fix(GenDoc) support bullet lists inside sections
tsolucio · Oct 26, 2023 · 79e4332 · 79e4332
2 parents cc02e55 + 4219dbe
commit 79e4332
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/modules/evvtgendoc/OpenDocument/List.php b/modules/evvtgendoc/OpenDocument/List.php
@@ -83,7 +83,9 @@ public function __construct(DOMNode $node, OpenDocument $document, $contnum = ''
 			$this->continuenum = $continuenum;
 		}
 
-		$this->allowedElements = array();
+		$this->allowedElements = array(
+			'OpenDocument_ListItem',
+		);
 	}
 
 	/**
@@ -190,6 +192,9 @@ public function createListItem($text = '') {
 	 * @access public
 	 */
 	public function getChildren() {
+		if (empty($this->children)) {
+			$this->listChildren();
+		}
 		return $this->children->getIterator();
 	}
 }

diff --git a/modules/evvtgendoc/OpenDocument/ListItem.php b/modules/evvtgendoc/OpenDocument/ListItem.php
@@ -64,6 +64,20 @@ class OpenDocument_ListItem extends OpenDocument_StyledElement {
 	 */
 	const styleNamePrefix = 'L';
 
+	/**
+	 * Constructor
+	 *
+	 * @param DOMNode $node
+	 * @param OpenDocument $document
+	 */
+	public function __construct(DOMNode $node, OpenDocument $document) {
+		parent::__construct($node, $document);
+		$this->allowedElements = array(
+			'OpenDocument_Paragraph',
+			'OpenDocument_Span',
+		);
+	}
+
 	/**
 	 * Create element instance
 	 *
@@ -174,6 +188,9 @@ public function createHeading($text = '', $level = 1) {
 	 * @access public
 	 */
 	public function getChildren() {
+		if (empty($this->children)) {
+			$this->listChildren();
+		}
 		return $this->children->getIterator();
 	}
 }

diff --git a/modules/evvtgendoc/OpenDocument/Section.php b/modules/evvtgendoc/OpenDocument/Section.php
@@ -76,6 +76,7 @@ public function __construct(DOMNode $node, OpenDocument $document) {
 			'OpenDocument_Span',
 			'OpenDocument_Paragraph',
 			'OpenDocument_Heading',
+			'OpenDocument_List',
 		);
 	}
 
@@ -125,5 +126,9 @@ public function createSpan($text) {
 	public function createHeading($text = '', $level = 1) {
 		return OpenDocument_Heading::instance($this, $text, $level);
 	}
+
+	public function createList() {
+		return OpenDocument_List::instance($this);
+	}
 }
 ?>