Updated s9e\TextFormatter

s9e · Dec 27, 2016 · 287761a · 287761a
1 parent 891f187
commit 287761a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/bundle.php b/bundle.php
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
 	"type": "phpbb-extension",
 	"description": "Embed third-party content in your phpBB forum",
 	"homepage": "https://github.com/s9e/phpbb-ext-mediaembed/",
-	"version": "20161115",
+	"version": "20161227",
 	"keywords": ["phpbb","embed","forum","media"],
 	"license": "MIT",
 	"require": {

diff --git a/parsing.php b/parsing.php
@@ -686,10 +686,6 @@ protected function processTags()
 				if (!$this->tagStackIsSorted)
 					$this->sortTags();
 				$this->currentTag = \array_pop($this->tagStack);
-				if ($this->context['flags'] & self::RULE_IGNORE_TAGS)
-					if (!$this->currentTag->canClose(\end($this->openTags))
-					 && !$this->currentTag->isSystemTag())
-						continue;
 				$this->processCurrentTag();
 			}
 			foreach ($this->openTags as $startTag)
@@ -699,11 +695,13 @@ protected function processTags()
 	}
 	protected function processCurrentTag()
 	{
-		if ($this->currentTag->isInvalid())
-			return;
+		if (($this->context['flags'] & self::RULE_IGNORE_TAGS)
+		 && !$this->currentTag->canClose(\end($this->openTags))
+		 && !$this->currentTag->isSystemTag())
+			$this->currentTag->invalidate();
 		$tagPos = $this->currentTag->getPos();
 		$tagLen = $this->currentTag->getLen();
-		if ($this->pos > $tagPos)
+		if ($this->pos > $tagPos && !$this->currentTag->isInvalid())
 		{
 			$startTag = $this->currentTag->getStartTag();
 			if ($startTag && \in_array($startTag, $this->openTags, \true))
@@ -725,8 +723,9 @@ protected function processCurrentTag()
 				}
 			}
 			$this->currentTag->invalidate();
-			return;
 		}
+		if ($this->currentTag->isInvalid())
+			return;
 		if ($this->currentTag->isIgnoreTag())
 			$this->outputIgnoreTag($this->currentTag);
 		elseif ($this->currentTag->isBrTag())
@@ -999,7 +998,7 @@ protected function insertTag(Tag $tag)
 	}
 	public function addTagPair($name, $startPos, $startLen, $endPos, $endLen, $prio = 0)
 	{
-		$endTag   = $this->addEndTag($name, $endPos, $endLen);
+		$endTag   = $this->addEndTag($name, $endPos, $endLen, -$prio);
 		$startTag = $this->addStartTag($name, $startPos, $startLen, $prio);
 		$startTag->pairWith($endTag);
 		return $startTag;

diff --git a/rendering.php b/rendering.php
diff --git a/vendor/s9e/TextFormatter b/vendor/s9e/TextFormatter
diff --git a/versions.json b/versions.json
@@ -1 +1 @@
-{"stable":{"20161115":{"current":"20161115","announcement":"https:\/\/www.phpbb.com\/community\/viewtopic.php?f=456&t=2272431","download":"https:\/\/github.com\/s9e\/phpbb-ext-mediaembed\/releases\/download\/20161115\/s9e-mediaembed-20161115.zip","eol":null,"security":false}}}
+{"stable":{"20161227":{"current":"20161227","announcement":"https:\/\/www.phpbb.com\/community\/viewtopic.php?f=456&t=2272431","download":"https:\/\/github.com\/s9e\/phpbb-ext-mediaembed\/releases\/download\/20161227\/s9e-mediaembed-20161227.zip","eol":null,"security":false}}}
+6 −1		composer.json
+1 −1		src/Bundles/Fatdown.php
+5 −5		src/Bundles/Fatdown/Renderer.php
+1 −1		src/Bundles/MediaPack.php
+2 −2		src/Bundles/MediaPack/Renderer.php
+5 −0		src/Configurator.php
+1 −0		src/Configurator/Bundles/Fatdown.php
+13 −20		src/Configurator/Items/AttributeFilters/RegexpFilter.php
+4 −4		src/Configurator/JavaScript/externs.application.js
+4 −4		src/Configurator/JavaScript/externs.service.js
+12 −17		src/Parser.js
+8 −9		src/Parser.php
+2 −2		src/Plugins/BBCodes/Configurator/repository.xml
+2 −2		src/Plugins/Emoji/Parser.js
+1 −1		src/Plugins/Emoji/Parser.php
+1 −1		src/Plugins/Escaper/Configurator.php
+14 −1		src/Plugins/FancyPants/Configurator.php
+69 −11		src/Plugins/FancyPants/Parser.js
+51 −11		src/Plugins/FancyPants/Parser.php
+3 −3		src/Plugins/Litedown/Parser.js
+2 −2		src/Plugins/Litedown/Parser.php
+1 −1		src/Plugins/MediaEmbed/Configurator/Collections/CachedDefinitionCollection.php
+55 −0		src/Plugins/PipeTables/Configurator.php
+369 −0		src/Plugins/PipeTables/Parser.js
+210 −0		src/Plugins/PipeTables/Parser.php
+19 −2		src/Renderers/XSLT.php
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"stable":{"20161115":{"current":"20161115","announcement":"https:\/\/www.phpbb.com\/community\/viewtopic.php?f=456&t=2272431","download":"https:\/\/github.com\/s9e\/phpbb-ext-mediaembed\/releases\/download\/20161115\/s9e-mediaembed-20161115.zip","eol":null,"security":false}}}
		{"stable":{"20161227":{"current":"20161227","announcement":"https:\/\/www.phpbb.com\/community\/viewtopic.php?f=456&t=2272431","download":"https:\/\/github.com\/s9e\/phpbb-ext-mediaembed\/releases\/download\/20161227\/s9e-mediaembed-20161227.zip","eol":null,"security":false}}}