all: Rename Unmormalized => Unnormalized

diff --git a/common/paths/pathparser.go b/common/paths/pathparser.go
index 897edb9b73d3186de7bdefa8ca77d97a2263d483..f506eb60fbcfd7e41c19c72b09333bb93074db24 100644 (file)
--- a/common/paths/pathparser.go
+++ b/common/paths/pathparser.go
@@ -359,8 +359,8 @@ func (p *Path) Path() (d string) {
        return p.norm(p.s)
 }
 
-// Unmormalized returns the Path with the original case preserved.
-func (p *Path) Unmormalized() *Path {
+// Unnormalized returns the Path with the original case preserved.
+func (p *Path) Unnormalized() *Path {
        return p.unnormalized
 }
 

diff --git a/common/paths/pathparser_test.go b/common/paths/pathparser_test.go
index 3546b66050ebac7b0714b30a73f70ac1c3cd84f0..27d0b45e9ca44f71e9fd802fb5d7345123f66ad9 100644 (file)
--- a/common/paths/pathparser_test.go
+++ b/common/paths/pathparser_test.go
@@ -93,7 +93,7 @@ func TestParse(t *testing.T) {
                        "Basic text file, mixed case and spaces, unnormalized",
                        "/a/Foo BAR.txt",
                        func(c *qt.C, p *Path) {
-                               pp := p.Unmormalized()
+                               pp := p.Unnormalized()
                                c.Assert(pp, qt.IsNotNil)
                                c.Assert(pp.BaseNameNoIdentifier(), qt.Equals, "Foo BAR")
                        },

diff --git a/hugolib/content_map_page.go b/hugolib/content_map_page.go
index 27b37a8fc35437778803c422597f533acad44e0e..1f4cd08809355ad189cc8d0aa8b07b09a737626e 100644 (file)
--- a/hugolib/content_map_page.go
+++ b/hugolib/content_map_page.go
@@ -1554,7 +1554,7 @@ func (sa *sitePagesAssembler) assembleResources() error {
                                                return false, nil
                                        }
 
-                                       relPathOriginal := rs.path.Unmormalized().PathRel(ps.m.pathInfo.Unmormalized())
+                                       relPathOriginal := rs.path.Unnormalized().PathRel(ps.m.pathInfo.Unnormalized())
                                        relPath := rs.path.BaseRel(ps.m.pathInfo)
 
                                        var targetBasePaths []string
@@ -1759,7 +1759,7 @@ func (sa *sitePagesAssembler) addMissingRootSections() error {
                        seen[section] = true
 
                        // Try to preserve the original casing if possible.
-                       sectionUnnormalized := p.Unmormalized().Section()
+                       sectionUnnormalized := p.Unnormalized().Section()
                        pth := sa.s.Conf.PathParser().Parse(files.ComponentFolderContent, "/"+sectionUnnormalized+"/_index.md")
                        nn := w.Tree.Get(pth.Base())
 

diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go
index b40477c02438410d3d44eca3e68a2e36fca32d0d..ef67b105942771ece88dbc0ce1e53052fd46ad72 100644 (file)
--- a/hugolib/hugo_sites.go
+++ b/hugolib/hugo_sites.go
@@ -502,7 +502,7 @@ func (h *HugoSites) handleDataFile(r *source.File) error {
 
        // Crawl in data tree to insert data
        current = h.data
-       dataPath := r.FileInfo().Meta().PathInfo.Unmormalized().Dir()[1:]
+       dataPath := r.FileInfo().Meta().PathInfo.Unnormalized().Dir()[1:]
        keyParts := strings.Split(dataPath, "/")
 
        for _, key := range keyParts {

diff --git a/hugolib/page__meta.go b/hugolib/page__meta.go
index 7b785abb6133eaa40eb70830e4edf8c400adb3e7..34fd096bd1829f625ed81a3469bbcb47dee3d554 100644 (file)
--- a/hugolib/page__meta.go
+++ b/hugolib/page__meta.go
@@ -195,7 +195,7 @@ func (p *pageMeta) Name() string {
                return p.resourcePath
        }
        if p.pageConfig.Kind == kinds.KindTerm {
-               return p.pathInfo.Unmormalized().BaseNameNoIdentifier()
+               return p.pathInfo.Unnormalized().BaseNameNoIdentifier()
        }
        return p.Title()
 }
@@ -742,7 +742,7 @@ func (p *pageMeta) applyDefaultValues() error {
                case kinds.KindHome:
                        p.pageConfig.Title = p.s.Title()
                case kinds.KindSection:
-                       sectionName := p.pathInfo.Unmormalized().BaseNameNoIdentifier()
+                       sectionName := p.pathInfo.Unnormalized().BaseNameNoIdentifier()
                        if p.s.conf.PluralizeListTitles {
                                sectionName = flect.Pluralize(sectionName)
                        }
@@ -754,7 +754,7 @@ func (p *pageMeta) applyDefaultValues() error {
                                panic("term not set")
                        }
                case kinds.KindTaxonomy:
-                       p.pageConfig.Title = strings.Replace(p.s.conf.C.CreateTitle(p.pathInfo.Unmormalized().BaseNameNoIdentifier()), "-", " ", -1)
+                       p.pageConfig.Title = strings.Replace(p.s.conf.C.CreateTitle(p.pathInfo.Unnormalized().BaseNameNoIdentifier()), "-", " ", -1)
                case kinds.KindStatus404:
                        p.pageConfig.Title = "404 Page not found"
                }

diff --git a/hugolib/page__paths.go b/hugolib/page__paths.go
index b0d2009e4325c7c45a1a2f6b9c8b76ff332f8674..6ae68aa254a2ff69cc28ca6c005d9ce863732bb7 100644 (file)
--- a/hugolib/page__paths.go
+++ b/hugolib/page__paths.go
@@ -116,8 +116,8 @@ func createTargetPathDescriptor(p *pageState) (page.TargetPathDescriptor, error)
        pageInfoPage := p.PathInfo()
        pageInfoCurrentSection := p.CurrentSection().PathInfo()
        if p.s.Conf.DisablePathToLower() {
-               pageInfoPage = pageInfoPage.Unmormalized()
-               pageInfoCurrentSection = pageInfoCurrentSection.Unmormalized()
+               pageInfoPage = pageInfoPage.Unnormalized()
+               pageInfoCurrentSection = pageInfoCurrentSection.Unnormalized()
        }
 
        desc := page.TargetPathDescriptor{

diff --git a/source/fileInfo.go b/source/fileInfo.go
index 6c67ba4073bf4dd95249e5aab3be0afa3eed7b13..1d222699435b3601d8fc54e21deb20f8ccf92d8a 100644 (file)
--- a/source/fileInfo.go
+++ b/source/fileInfo.go
@@ -130,7 +130,7 @@ func (fi *File) pathToDir(s string) string {
 }
 
 func (fi *File) p() *paths.Path {
-       return fi.fim.Meta().PathInfo.Unmormalized()
+       return fi.fim.Meta().PathInfo.Unnormalized()
 }
 
 func NewFileInfoFrom(path, filename string) *File {