From bc9833cf9794dbdf6af2a04ac4619a75c88f6db2 Mon Sep 17 00:00:00 2001
From: George Cushen <gcushen@users.noreply.github.com>
Date: Sat, 16 Nov 2019 18:10:09 +0000
Subject: [PATCH] theme: upgrade to v4.6.0 public release

---
 config/_default/params.toml | 15 ++++++++++-----
 data/page_sharer.toml       |  2 +-
 themes/academic             |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/config/_default/params.toml b/config/_default/params.toml
index c3fbd28..d719758 100644
--- a/config/_default/params.toml
+++ b/config/_default/params.toml
@@ -136,9 +136,8 @@ date_format = "Jan 2, 2006"
 #   Examples: "3:04 pm" or "15:04"
 time_format = "3:04 PM"
 
-# List delimiter (separates parts of an address)
-# Popular separators are ", " (comma), "<br>" (new line), " " (space)
-list_delimiter = ", "
+# Address format (choose from the [address_formats] list below or add you own to the list).
+address_format = "en-us"
 
 ############################
 ## Advanced
@@ -147,8 +146,8 @@ list_delimiter = ", "
 # Get user avatars from Gravatar.com? (true/false)
 gravatar = false
 
-# Align the main menu to the right of the page? (true/false)
-menu_align_right = false
+# Main menu alignment (l = left, c = center, r = right) and logo options.
+main_menu = {align = "l", show_logo = true}
 
 # Show estimated reading time for posts? (true/false)
 reading_time = true
@@ -167,6 +166,12 @@ link_authors = true
 #   E.g. To load `/assets/js/custom.js`, set `plugins_js = ["custom"]`.
 plugins_js  = []
 
+# Available address formats.
+[address_formats]
+  en-us = {order = ['street', 'city', 'region', 'postcode'], delimiters = [', ', ', ', ' ', '']}
+  en-gb = {order = ['street', 'city', 'region', 'postcode'], delimiters = [', ', ', ', ', ', '']}
+  zh = {order = ['postcode', 'region', 'city', 'street'], delimiters = [' ', ' ', ' ', '']}
+
 # Configuration of publication pages.
 [publications]
   # Date format (refer to https://sourcethemes.com/academic/docs/customization/#date-format )
diff --git a/data/page_sharer.toml b/data/page_sharer.toml
index 86df601..3400da5 100644
--- a/data/page_sharer.toml
+++ b/data/page_sharer.toml
@@ -14,7 +14,7 @@
   url = "https://www.facebook.com/sharer.php?u={url}&t={title}"
   title = "Facebook"
   icon_pack = "fab"
-  icon = "facebook-f"
+  icon = "facebook"
   enable = true
 
 [[buttons]]
diff --git a/themes/academic b/themes/academic
index 24bfa6f..a1f5a3c 160000
--- a/themes/academic
+++ b/themes/academic
@@ -1 +1 @@
-Subproject commit 24bfa6fa4d084b0ac3f64ddcb2d71e4916c0e583
+Subproject commit a1f5a3cdd04fa481c54e5dbe5066921fc3c3b7b1