From ab5862cd00d84114cc82cde88d31ab1d8eddd388 Mon Sep 17 00:00:00 2001
From: bep <bjorn.erik.pedersen@gmail.com>
Date: Mon, 2 Mar 2015 21:23:16 +0100
Subject: Allow the same shortcode to  be used with or without inline content

Fixes #934
---
 hugolib/shortcode.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'hugolib/shortcode.go')

diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go
index f144fa38b..08a48d98b 100644
--- a/hugolib/shortcode.go
+++ b/hugolib/shortcode.go
@@ -307,15 +307,21 @@ Loop:
 			}
 
 		case tScClose:
+			next := pt.peek()
 			if !isInner {
-				next := pt.peek()
 				if next.typ == tError {
 					// return that error, more specific
 					continue
 				}
 				return sc, fmt.Errorf("Shortcode '%s' in page '%s' has no .Inner, yet a closing tag was provided", next.val, p.FullFilePath())
 			}
-			pt.consume(2)
+			if next.typ == tRightDelimScWithMarkup || next.typ == tRightDelimScNoMarkup {
+				// self-closing
+				pt.consume(1)
+			} else {
+				pt.consume(2)
+			}
+
 			return sc, nil
 		case tText:
 			sc.inner = append(sc.inner, currItem.val)
-- 
cgit v1.2.3