diff --git a/src/markup/engine/__tests__/remarkup/horizonal-rule.txt b/src/markup/engine/__tests__/remarkup/horizonal-rule.txt
index 93bc397..c36a7f2 100644
--- a/src/markup/engine/__tests__/remarkup/horizonal-rule.txt
+++ b/src/markup/engine/__tests__/remarkup/horizonal-rule.txt
@@ -1,35 +1,41 @@
 ___
 
 _____
 
 ***
 
 * * * * * * *
 
 ---
 
 - - - - - - -
+
+ ---
 ~~~~~~~~~~
 <hr class="remarkup-hr" />
 
 <hr class="remarkup-hr" />
 
 <hr class="remarkup-hr" />
 
 <hr class="remarkup-hr" />
 
 <hr class="remarkup-hr" />
 
-<hr class="remarkup-hr" />
-~~~~~~~~~~
 <hr class="remarkup-hr" />
 
 <hr class="remarkup-hr" />
+~~~~~~~~~~
+___
 
-<hr class="remarkup-hr" />
+_____
 
-<hr class="remarkup-hr" />
+***
 
-<hr class="remarkup-hr" />
+* * * * * * *
 
-<hr class="remarkup-hr" />
+---
+
+- - - - - - -
+
+ ---
diff --git a/src/markup/engine/__tests__/remarkup/percent-block-oneline.txt b/src/markup/engine/__tests__/remarkup/percent-block-oneline.txt
index f82ae61..0bc8847 100644
--- a/src/markup/engine/__tests__/remarkup/percent-block-oneline.txt
+++ b/src/markup/engine/__tests__/remarkup/percent-block-oneline.txt
@@ -1,5 +1,11 @@
 %%%[[http://hello | world]] **bold**%%%
+
+  %%%[[http://hello | world]] **bold**%%%
 ~~~~~~~~~~
+[[http://hello | world]] **bold**
+
 [[http://hello | world]] **bold**
 ~~~~~~~~~~
 [[http://hello | world]] **bold**
+
+[[http://hello | world]] **bold**
diff --git a/src/markup/engine/remarkup/blockrule/PhutilRemarkupHorizontalRuleBlockRule.php b/src/markup/engine/remarkup/blockrule/PhutilRemarkupHorizontalRuleBlockRule.php
index 487a34e..7b815b2 100644
--- a/src/markup/engine/remarkup/blockrule/PhutilRemarkupHorizontalRuleBlockRule.php
+++ b/src/markup/engine/remarkup/blockrule/PhutilRemarkupHorizontalRuleBlockRule.php
@@ -1,33 +1,37 @@
 <?php
 
 final class PhutilRemarkupHorizontalRuleBlockRule
   extends PhutilRemarkupBlockRule {
 
   /**
    * This rule executes at priority `300`, so it can preempt the list block
    * rule and claim blocks which begin `---`.
    */
   public function getPriority() {
     return 300;
   }
 
   public function getMatchingLineCount(array $lines, $cursor) {
     $num_lines = 0;
-    $pattern = '/^_{3,}$|^\*\s?\*\s?\*(\s|\*)*$|^\-\s?\-\s?\-(\s|\-)*$/';
+    $pattern = '/^\s*(?:_{3,}|\*\s?\*\s?\*(\s|\*)*|\-\s?\-\s?\-(\s|\-)*)$/';
     if (preg_match($pattern, rtrim($lines[$cursor], "\n\r"))) {
       $num_lines++;
       $cursor++;
       while (isset($lines[$cursor]) && !strlen(trim($lines[$cursor]))) {
         $num_lines++;
         $cursor++;
       }
     }
 
     return $num_lines;
   }
 
   public function markupText($text, $children) {
+    if ($this->getEngine()->isTextMode()) {
+      return rtrim($text);
+    }
+
     return phutil_tag('hr', array('class' => 'remarkup-hr'));
   }
 
 }
diff --git a/src/markup/engine/remarkup/blockrule/PhutilRemarkupLiteralBlockRule.php b/src/markup/engine/remarkup/blockrule/PhutilRemarkupLiteralBlockRule.php
index 72646ff..abbba32 100644
--- a/src/markup/engine/remarkup/blockrule/PhutilRemarkupLiteralBlockRule.php
+++ b/src/markup/engine/remarkup/blockrule/PhutilRemarkupLiteralBlockRule.php
@@ -1,33 +1,45 @@
 <?php
 
 final class PhutilRemarkupLiteralBlockRule extends PhutilRemarkupBlockRule {
 
   public function getMatchingLineCount(array $lines, $cursor) {
     $num_lines = 0;
-    if (preg_match('/^%%%/', $lines[$cursor])) {
+    if (preg_match('/^\s*%%%/', $lines[$cursor])) {
       $num_lines++;
 
       while (isset($lines[$cursor])) {
         if (!preg_match('/%%%\s*$/', $lines[$cursor])) {
           $num_lines++;
           $cursor++;
           continue;
         }
         break;
       }
+
+      $cursor++;
+
+      while (isset($lines[$cursor])) {
+        if (!strlen(trim($lines[$cursor]))) {
+          $num_lines++;
+          $cursor++;
+          continue;
+        }
+        break;
+      }
+
     }
 
     return $num_lines;
   }
 
   public function markupText($text, $children) {
-    $text = preg_replace('/%%%\s*$/', '', substr($text, 3));
+    $text = preg_replace('/^\s*%%%(.*)%%%\s*\z/s', '\1', $text);
     if ($this->getEngine()->isTextMode()) {
       return $text;
     }
 
     $text = phutil_split_lines($text, $retain_endings = true);
     return phutil_implode_html(phutil_tag('br', array()), $text);
   }
 
 }