documentation update !bibliography & !glossary

2 files changed, 63 insertions, 17 deletions

diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7
index b9541814..f7568f01 100644
--- a/data/doc/sisu/CHANGELOG_v7
+++ b/data/doc/sisu/CHANGELOG_v7
@@ -51,8 +51,13 @@ Reverse Chronological:
         (used in substitutions: when an id is found within text
         the short name will be used to replace it)
 
+
   * glossary 1~!glossary
 
+  * documentation update
+    * bibliography
+    * glossary
+
   * qi (quick installer) cleaning
 
   * clean cruft in changelogs
diff --git a/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst b/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst
index d94f9a7a..f67db5a1 100644
--- a/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst
+++ b/data/doc/sisu/markup-samples/manual/en/sisu_markup.sst
@@ -1334,34 +1334,34 @@ code{
 }code
 
 2~ Bibliography / References
-={ SiSU markup:references|bibliography|citations;references;book index }
+={ SiSU markup:references|bibliography|citations;references }
 
-There are three ways to prepare a bibliography using sisu: (i) manually preparing and marking up as regular text in sisu a list of references; (ii) (tagging citations for inclusion) using a restricted form for citations and marking them up to identify them as such (which sisu then parses and attempts to build a bibliography from), or; (iii) preparing a bibliography, using metadata tags for author: title: year: and the like, including an id: and shortname: the id can be inserted in footnotes in place of the citation, and it will be substituted there by the short title for the work.
+There are three ways to prepare a bibliography using sisu (which are mutually exclusive): (i) manually preparing and marking up as regular text in sisu a list of references, this is treated as a regular document segment (and placed before endnotes if any); (ii) preparing a bibliography, marking a heading level 1~!biblio (note the exclamation mark) and preparing a bibliography using various metadata tags including for author: title: year: a list of which is provided below, or; (iii) as an assistance in preparing a bibliography, marking a heading level 1~!biblio and tagging citations within footnotes for inclusion, identifying citations and having a parser attempt to extract them and build a bibliography of the citations provided.
 
 For the heading/section sequence: endnotes, bibliography then book index to occur, the name biblio or bibliography must be given to the bibliography section, like so:
 
 code{
 
-1~biblio Bibliography
+1~!biblio
 
 }code
 
 3~ a markup tagged metadata bibliography section
 
-Here instead of writing your full citations directly in footnotes, each time you have new material to cite, you add it to your bibliography section (if it has not been added yet) providing the information you need against an available list of tags. At the time of writing, for articles: au|author; ti|title; lng|language; jo|journal; vo|volume; edr|editor; yr|year; pst|publisher_state; url; note; sn|shortname; id; and \\ for books: au|author; ti|title; st|subtitle; lng|language; pb|publisher; edn|edition; yr|year; pst|publisher_state; url; note; sn|shortname; id.
+Here instead of writing your full citations directly in footnotes, each time you have new material to cite, you add it to your bibliography section (if it has not been added yet) providing the information you need against an available list of tags (provided below).
 
 The required tags are au: ti: and year: ~{for which you may alternatively use the full form author: title: and year: }~ an short quick example might be as follows:
 
 code{
 
-1~biblio Bibliography
+1~!biblio
 
 au: von Hippel, E.
 ti: Perspective: User Toolkits for Innovation
 lng: (language)
 jo: Journal of Product Innovation Management
 vo: 18
-edr: (editor)
+ed: (editor)
 yr: 2001
 note:
 sn: Hippel, /{User Toolkits}/ (2001)
@@ -1375,7 +1375,7 @@ lng: (language)
 pb: Harvard University Press
 edn: (edition)
 yr: 2006
-pst: U.S.
+pl: U.S.
 url: http://cyber.law.harvard.edu/wealth_of_networks/Main_Page
 note:
 sn: Benkler, /{Wealth of Networks}/ (2006)
@@ -1387,22 +1387,16 @@ jo: Imaginary Journal
 yr: 1605
 url: https://en.wikipedia.org/wiki/Don_Quixote
 note: made up to provide an example of author markup for an article with two authors
-sn: Quixote and Panza, /{Taming Windmills}/ (1605)
+sn: Quixote & Panza, /{Taming Windmills}/ (1605)
 id: quixote1605
 
 }code
 
-Note that the section name biblio (or bibliography) is required for the bibliography to be recognized as such, parsed correctly, and placed after the auto-generated endnote section.
+Note that the section name !biblio (or !bibliography) is required for the bibliography to be treated specially as such, and placed after the auto-generated endnote section.
 
-Using this method, work goes into preparing the bibliography, which will be automatically sorted by surname and presented, under the References or Bibliography section using the format for books:
+Using this method, work goes into preparing the bibliography, the tags author or editor, year and title are required and will be used to sort the bibliography that is placed under the Bibliography section
 
-_1 number, author (firstname & initials, surname), fulltitle, publisher, year, url (if any)
-
-and for articles:
-
-_1 number, author (firstname & initials, surname), title, journal, volume, year, url (if any)
-
-The metadata tags may include shortname and id, if provided, every time the given id is found within the text it will be replaced by the given short title of the work (it is for this reason the short title has sisu markup to italicize the title), it should work with any page numbers to be added, the short title should be one that can easily be used to look up the full description in the bibliography.
+The metadata tags may include shortname (sn:) and id, if provided, which are used for substitution within text. Every time the given id is found within the text it will be replaced by the given short title of the work (it is for this reason the short title has sisu markup to italicize the title), it should work with any page numbers to be added, the short title should be one that can easily be used to look up the full description in the bibliography.
 
 code{
 
@@ -1414,6 +1408,34 @@ would be presented as:
 
 Quixote and Panza, /{Taming Windmills}/ (1605), pp 1000 - 1001 also, Benkler, /{Wealth of Networks}/, (2006) p 1 or rather~{ Quixote and Panza, /{Taming Windmills}/ (1605), pp 1000 - 1001 also, Benkler, /{Wealth of Networks}/ (2006), p 1 }~
 
+code{
+
+au: author Surname, FirstNames (if multiple semi-colon separator)
+    (required unless editor to be used instead)
+ti: title  (required)
+st: subtitle
+jo: journal
+vo: volume
+ed: editor (required if author not provided)
+tr: translator
+src: source (generic field where others are not appropriate)
+in: in (like src)
+pl: place/location (state, country)
+pb: publisher
+edn: edition
+yr: year (yyyy or yyyy-mm or yyyy-mm-dd) (required)
+pg: pages
+url: http://url
+note: note
+id: create_short_identifier e.g. authorSurnameYear
+    (used in substitutions: when found within text will be
+    replaced by the short name provided)
+sn: short name e.g. Author, /{short title}/, Year
+    (used in substitutions: when an id is found within text
+    the short name will be used to replace it)
+
+}code
+
 3~ Tagging citations for inclusion in the Bibliography
 
 Here whenever you make a citation that you wish be included in the bibliography, you tag the citation as such using special delimiters (which are subsequently removed from the final text produced by sisu)
@@ -1428,6 +1450,25 @@ See .: Quixote, Don; Panza, Sancho /{Taming Windmills, Keeping True}/ (1605) :.
 
 SiSU will parse for a number of patterns within the delimiters to try make out the authors, title, date etc. and from that create a Bibliography. This is more limited than the previously described method of preparing a tagged bibliography, and using an id within text to identify the work, which also lends itself to greater consistency.
 
+2~ Glossary
+={ SiSU markup:glossary|Glossary }
+
+Using the section name 1~!glossary results in the Glossary being treated specially as such, and placed after the auto-generated endnote section (before the bibliography/list of references if there is one).
+
+The Glossary is ordinary text marked up in a manner deemed suitable for that purpose. e.g. with the term in bold, possibly with a hanging indent.
+
+code{
+
+1~!glossary
+
+_0_1 *{GPL}* An abbreviation that stands for "General Purpose License." ...
+
+_0_1 [provide your list of terms and definitions]
+
+}code
+
+In the given example the first line is not indented subsequent lines are by one level, and the term to be defined is in bold text.
+
 2~ Book index
 ={ SiSU markup:book index;book index }