From bfb9613a14ab2d93a4474e5486d22e52a9d5e2b3 Mon Sep 17 00:00:00 2001 From: Bjørn Erik Pedersen Date: Wed, 6 Nov 2019 20:10:47 +0100 Subject: Add Goldmark as the new default markdown handler This commit adds the fast and CommonMark compliant Goldmark as the new default markdown handler in Hugo. If you want to continue using BlackFriday as the default for md/markdown extensions, you can use this configuration: ```toml [markup] defaultMarkdownHandler="blackfriday" ``` Fixes #5963 Fixes #1778 Fixes #6355 --- parser/lowercase_camel_json.go | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 parser/lowercase_camel_json.go (limited to 'parser') diff --git a/parser/lowercase_camel_json.go b/parser/lowercase_camel_json.go new file mode 100644 index 000000000..e7aeb2abf --- /dev/null +++ b/parser/lowercase_camel_json.go @@ -0,0 +1,51 @@ +// Copyright 2019 The Hugo Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package parser + +import ( + "encoding/json" + "regexp" + "unicode" + "unicode/utf8" +) + +// Regexp definitions +var keyMatchRegex = regexp.MustCompile(`\"(\w+)\":`) +var wordBarrierRegex = regexp.MustCompile(`(\w)([A-Z])`) + +// Code adapted from https://gist.github.com/piersy/b9934790a8892db1a603820c0c23e4a7 +type LowerCaseCamelJSONMarshaller struct { + Value interface{} +} + +func (c LowerCaseCamelJSONMarshaller) MarshalJSON() ([]byte, error) { + marshalled, err := json.Marshal(c.Value) + + converted := keyMatchRegex.ReplaceAllFunc( + marshalled, + func(match []byte) []byte { + // Empty keys are valid JSON, only lowercase if we do not have an + // empty key. + if len(match) > 2 { + // Decode first rune after the double quotes + r, width := utf8.DecodeRune(match[1:]) + r = unicode.ToLower(r) + utf8.EncodeRune(match[1:width+1], r) + } + return match + }, + ) + + return converted, err +} -- cgit v1.2.3