Merge pull request #454 from GlazerMann/patch-16

Convert page range to pages if end=start

Template.php

@@ -2330,6 +2330,15 @@ protected function tidy() {
                     " parameter" . tag());
               $p->val = mb_ereg_replace(TO_EN_DASH, EN_DASH, $p->val);
             }
+            if (   (mb_substr_count($p->val, "–") === 1) // Exactly one EN_DASH.  
+                && (mb_stripos($p->val, "http") === FALSE)) { 
+              $the_dash = mb_strpos($p->val, "–"); // ALL must be mb_ functions because of long dash
+              $part1 = mb_substr($p->val, 0, $the_dash);
+              $part2 = mb_substr($p->val, $the_dash + 1);
+              if ($part1 === $part2) {
+                $p->val = $part1;
+              }
+            }
             break;
           case 'coauthor': case 'coauthors':  // Commonly left there and empty and deprecated
             if ($this->blank($pmatch[1])) $this->forget($pmatch[1]);

tests/phpunit/TemplateTest.php

@@ -693,13 +693,20 @@ public function testConvertJournalToBook() {
    public function testPagesDash() {
        $text = '{{cite journal|pages=1-2|title=do change}}';
        $expanded = $this->process_citation($text);
-       $this->assertEquals('1–2',$expanded->get('pages'));
+       $this->assertEquals('1–2', $expanded->get('pages'));
        $text = '{{cite journal|at=1-2|title=do not change}}';
        $expanded = $this->process_citation($text);
-       $this->assertEquals('1-2',$expanded->get('at'));
+       $this->assertEquals('1-2', $expanded->get('at'));
        $text = '{{cite journal|pages=[http://bogus.bogus/1–2/ 1–2]|title=do not change }}';
        $expanded = $this->process_citation($text);
-       $this->assertEquals('[http://bogus.bogus/1–2/ 1–2]',$expanded->get('pages'));
+       $this->assertEquals('[http://bogus.bogus/1–2/ 1–2]', $expanded->get('pages'));
+   }
+
+   public function testCollapseRanges() {
+       $text = '{{cite journal|pages=1233-1233|year=1999-1999}}';
+       $expanded = $this->process_citation($text);
+       $this->assertEquals('1233', $expanded->get('pages'));
+       $this->assertEquals('1999', $expanded->get('year'));
    }
 
    public function testDoNotAddYearIfDate() {