From 014ff075c1f2e8bd0c8fe34ba6e72d3c51f393e4 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Mon, 22 Apr 2019 13:46:52 -0700
Subject: [PATCH] Config changes for the next round of updates

---
 src/resources/lexicon.cfg | 56 ++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/resources/lexicon.cfg b/src/resources/lexicon.cfg
index 7185b72..8cbe4f0 100644
--- a/src/resources/lexicon.cfg
+++ b/src/resources/lexicon.cfg
@@ -1,11 +1,6 @@
 # LEXIPYTHON CONFIG FILE
 #
 # This file defines the configuration values for an instance of Lexipython.
-# Configuration values are written as:
->>>CONFIG_NAME>>>
-value
-<<<CONFIG_NAME<<<
-# The above defines a config value named CONFIG_NAME with a value of "value".
 
 # The title of the Lexicon game, displayed at the top of each entry.
 >>>LEXICON_TITLE>>>
@@ -29,33 +24,46 @@ logo.png
 <p>Put session information here, like the index grouping and turn count, where to send completed entries, index assignments, turn schedule, and so on.</p>
 <<<SESSION_PAGE<<<
 
-# Index headers. An index is a string of characters, which are the characters
-# an entry has to begin with to fall under that index. Indices will be listed
-# in the order written. Entries will be put into the first index they match.
-# Leftover entries will be listed under "&c." at the end.
+# Index headers. An index header is declared as id:pattern or id[pri]:pattern.
+# An article is sorted under the first index it matches. Indices are checked
+# first in descending order of pri and in list order at each value of pri.
+# An undefined pri value is 0.
+# A character index has id "char". An article matches a character index if the
+# first letter of its title is one of the characters in the index's pattern.
+# A prefix index has id "prefix". An article matches a prefix index if the
+# title begins with the pattern.
+# The etc index has id "etc". An article always matches the etc index. The
+# pattern is used as the index display name.
 >>>INDEX_LIST>>>
-ABC
-DEF
-GHI
-JKL
-MNO
-PQRS
-TUV
-WXYZ
+char:ABC
+char:DEF
+char:GHI
+char:JKL
+char:MNO
+char:PQRS
+char:TUV
+char:WXYZ
+etc:&c.
 <<<INDEX_LIST<<<
 
 # The default sorting to use on the contents page.
-# Allowed values are "?byturn" and "?byindex".
+# Allowed values are "turn", "player", and "index"
 >>>DEFAULT_SORT>>>
-?byturn
+index
 <<<DEFAULT_SORT<<<
 
+# Flag to enable addendum articles. If enabled, articles with the same title
+# and a later turn than another article will be appended to that article.
+>>>ALLOW_ADDENDA>>>
+False
+<<<ALLOW_ADDENDA<<<
+
 # Graphviz file name. If present, the graph of page citations will be written
-# in the dot file format.
+# in the .dot format.
 >>>GRAPHVIZ_FILE>>>
 <<<GRAPHVIZ_FILE<<<
 
-# Print version file name. If present, the lexicon will be compiled and written
-# into a single print-ready HTML file.
->>>PRINTABLE_FILE>>>
-<<<PRINTABLE_FILE<<<
+# Searchable version file name. If present, the lexicon will be compiled and
+# written into a single, easily-searchable HTML file.
+>>>SEARCHABLE_FILE>>>
+<<<SEARCHABLE_FILE<<<