fix: missing <p> tag when content has one line

fixed #49
reuixiy · Jan 9, 2020 · d7f4b8f · d7f4b8f
1 parent 01039b7
commit d7f4b8f
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 10 deletions.
diff --git a/layouts/index.sectionsatom.xml b/layouts/index.sectionsatom.xml
@@ -58,7 +58,7 @@
             {{- partial "components/summary.html" $page -}}
             {{- $summary := .Description | default ($page.Scratch.Get "summary" | plainify | replaceRE `\n……` ``) -}}
             {{- $raw := $summary -}}
-            {{- partial "components/markdownify.html" (dict "Deliver" $page "raw" $raw) -}}
+            {{- partial "components/markdownify.html" (dict "Deliver" $page "raw" $raw "isContent" false) -}}
             {{- $summary := $page.Scratch.Get "Content" -}}
             {{ printf `<summary type="html"><![CDATA[%s]]></summary>` ($summary | htmlUnescape) | safeHTML }}
             {{ if $.Site.Params.includeContent }}

diff --git a/layouts/index.sectionsrss.xml b/layouts/index.sectionsrss.xml
@@ -53,7 +53,7 @@
                     {{- partial "components/summary.html" $page -}}
                     {{- $summary := .Description | default ($page.Scratch.Get "summary" | plainify | replaceRE `\n……` ``) -}}
                     {{- $raw := $summary -}}
-                    {{- partial "components/markdownify.html" (dict "Deliver" $page "raw" $raw) -}}
+                    {{- partial "components/markdownify.html" (dict "Deliver" $page "raw" $raw "isContent" false) -}}
                     {{- $summary := $page.Scratch.Get "Content" -}}
                     {{ printf `<description><![CDATA[%s]]></description>` ($summary | htmlUnescape) | safeHTML }}
                 {{ end }}

diff --git a/layouts/partials/components/content.html b/layouts/partials/components/content.html
@@ -1,6 +1,6 @@
 {{- $Deliver := . -}}
 {{- $raw := .RawContent -}}
-{{- partial "components/markdownify.html" (dict "Deliver" . "raw" $raw) -}}
+{{- partial "components/markdownify.html" (dict "Deliver" . "raw" $raw "isContent" true) -}}
 
 <!-- Link Headings to TOC -->
 {{- $Content := .Scratch.Get "Content" -}}

diff --git a/layouts/partials/components/markdownify.html b/layouts/partials/components/markdownify.html
@@ -42,6 +42,13 @@
 {{- $Content := $Content | markdownify -}}
 {{- $Deliver.Scratch.Set "Content" $Content -}}
 
+<!-- https://github.com/reuixiy/hugo-theme-meme/issues/49 -->
+{{- $Content := $Deliver.Scratch.Get "Content" -}}
+{{- if and (not (strings.HasPrefix $Content "<p>")) $isContent -}}
+    {{- $Content := (printf `<p>%s</p>` $Content) | safeHTML -}}
+    {{- $Deliver.Scratch.Set "Content" $Content -}}
+{{- end -}}
+
 <!-- External Links -->
 {{- $Content := $Deliver.Scratch.Get "Content" -}}
 {{- if $Deliver.Site.Params.hrefTargetBlank -}}

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
@@ -27,21 +27,21 @@
 
             {{- if .Site.Params.displayPoweredBy }}
                 {{- $raw := `Powered by [Hugo](https://github.com/gohugoio/hugo) | Theme is [MemE](https://github.com/reuixiy/hugo-theme-meme)` -}}
-                {{- partial "components/markdownify.html" (dict "Deliver" $Deliver "raw" $raw) -}}
+                {{- partial "components/markdownify.html" (dict "Deliver" $Deliver "raw" $raw "isContent" false) -}}
                 {{- $Content := .Scratch.Get "Content" -}}
                 <div class="powered-by">{{ $Content | safeHTML }}</div>
             {{- end }}
 
             {{- if .Site.Params.displaySiteCopyright }}
                 {{- $raw := .Site.Copyright -}}
-                {{- partial "components/markdownify.html" (dict "Deliver" $Deliver "raw" $raw) -}}
+                {{- partial "components/markdownify.html" (dict "Deliver" $Deliver "raw" $raw "isContent" false) -}}
                 {{- $Content := .Scratch.Get "Content" -}}
                 <div class="site-copyright">{{ $Content | safeHTML }}</div>
             {{- end }}
 
             {{- with .Site.Params.customFooter }}
                 {{- $raw := . -}}
-                {{- partial "components/markdownify.html" (dict "Deliver" $Deliver "raw" $raw) -}}
+                {{- partial "components/markdownify.html" (dict "Deliver" $Deliver "raw" $raw "isContent" false) -}}
                 {{- $Content := $Deliver.Scratch.Get "Content" -}}
                 <div class="custom-footer">{{ $Content | safeHTML }}</div>
             {{- end }}

diff --git a/layouts/partials/page/home-poetry.html b/layouts/partials/page/home-poetry.html
@@ -3,7 +3,7 @@
     <div class="poetry">
         {{ range .Site.Params.homePoetry }}
             {{- $raw := . -}}
-            {{- partial "components/markdownify.html" (dict "Deliver" $Deliver "raw" $raw) -}}
+            {{- partial "components/markdownify.html" (dict "Deliver" $Deliver "raw" $raw "isContent" false) -}}
             {{- $Content := $Deliver.Scratch.Get "Content" -}}
             <p>{{ $Content | safeHTML }}</p>
         {{ end }}

diff --git a/layouts/partials/post-copyright.html b/layouts/partials/post-copyright.html
@@ -18,7 +18,7 @@
             {{ end }}
             {{ with $author.copyright }}
                 {{- $raw := . -}}
-                {{- partial "components/markdownify.html" (dict "Deliver" $Deliver "raw" $raw) -}}
+                {{- partial "components/markdownify.html" (dict "Deliver" $Deliver "raw" $raw "isContent" false) -}}
                 {{- $Content := $Deliver.Scratch.Get "Content" -}}
                 <li class="copyright-item license">{{ printf `%s%s` (i18n "copyrightLicense") $Content | safeHTML }}</li>
             {{ end }}

diff --git a/layouts/partials/post.html b/layouts/partials/post.html
@@ -15,15 +15,15 @@ <h1 class="post-title">{{ .Title }}</h1>
 
             {{ with .Params.subtitle }}
                 {{- $raw := . -}}
-                {{- partial "components/markdownify.html" (dict "Deliver" $Deliver "raw" $raw) -}}
+                {{- partial "components/markdownify.html" (dict "Deliver" $Deliver "raw" $raw "isContent" false) -}}
                 {{- $Content := $Deliver.Scratch.Get "Content" -}}
                 <div class="post-subtitle">{{ $Content | safeHTML }}</div>
             {{ end }}
 
             {{ if .Site.Params.displayPostDescription }}
                 {{ with .Params.description }}
                     {{- $raw := . -}}
-                    {{- partial "components/markdownify.html" (dict "Deliver" $Deliver "raw" $raw) -}}
+                    {{- partial "components/markdownify.html" (dict "Deliver" $Deliver "raw" $raw "isContent" false) -}}
                     {{- $Content := $Deliver.Scratch.Get "Content" -}}
                     <div class="post-description">{{ $Content | safeHTML }}</div>
                 {{ end }}