merge more improvements from Dora

3 files changed, 1472 insertions, 91 deletions

diff --git a/doc/cbdc-it/agsm-mod.bst b/doc/cbdc-it/agsm-mod.bst
new file mode 100644
index 000000000..ac1bbd052
--- /dev/null
+++ b/doc/cbdc-it/agsm-mod.bst
@@ -0,0 +1,1375 @@
+% BibTeX standard bibliography style `agsm' (one of the harvard family)
+	% version 0.99a for BibTeX versions 0.99a or later, LaTeX version 2.09.
+	% Copyright (C) 1991, all rights reserved.
+	% Copying of this file is authorized only if either
+	% (1) you make absolutely no changes to your copy, including name, or
+	% (2) if you do make changes, you name it something other than
+	% btxbst.doc, plain.bst, unsrt.bst, alpha.bst, abbrv.bst, agsm.bst,
+        % dcu.bst or kluwer.bst.
+	% This restriction helps ensure that all standard styles are identical.
+	% The file harvard.tex has the documentation for this style.
+
+% ACKNOWLEDGEMENT:
+%   This document is a modified version of alpha.bst to which it owes much of
+%   its functionality.
+
+% AUTHOR
+%   Peter Williams, Key Centre for Design Quality, Sydney University
+%   e-mail: peterw@archsci.arch.su.oz.au
+
+ENTRY
+  { address
+    author
+    booktitle
+    chapter
+    edition
+    editor
+    howpublished
+    institution
+    journal
+    key
+    month
+    note
+    number
+    organization
+    pages
+    publisher
+    school
+    series
+    title
+    type
+    URL
+    volume
+    year
+  }
+  { field.used etal.allowed etal.required} %%%XXX change
+  { extra.label sort.label list.year }
+
+INTEGERS { output.state before.all mid.sentence after.sentence after.block }
+
+FUNCTION {init.state.consts}
+{ #0 'before.all :=
+  #1 'mid.sentence :=
+  #2 'after.sentence :=
+  #3 'after.block :=
+}
+
+STRINGS { s t f }
+
+FUNCTION {output.nonnull}
+{ 's :=
+  output.state mid.sentence =
+    { ", " * write$ }
+    { output.state after.block =
+	{ add.period$ write$
+	  newline$
+	  "\newblock " write$
+	}
+	{ output.state before.all =
+	    'write$
+	    { add.period$ " " * write$ }
+	  if$
+	}
+      if$
+      mid.sentence 'output.state :=
+    }
+  if$
+  s
+}
+
+FUNCTION {output}
+{ duplicate$ empty$
+    'pop$
+    'output.nonnull
+  if$
+}
+
+FUNCTION {output.check}
+{ 't :=
+  duplicate$ empty$
+    { pop$ "empty " t * " in " * cite$ * warning$ }
+    'output.nonnull
+  if$
+}
+
+FUNCTION {item.check}
+{ 't :=
+  empty$
+    { "empty " t * " in " * cite$ * warning$ }
+    { skip$ }
+  if$
+}
+
+FUNCTION {fin.entry}
+{ add.period$
+  write$
+  newline$
+}
+
+FUNCTION {new.block}
+{ output.state before.all =
+    'skip$
+    { after.block 'output.state := }
+  if$
+}
+
+FUNCTION {not}
+{   { #0 }
+    { #1 }
+  if$
+}
+
+FUNCTION {and}
+{   'skip$
+    { pop$ #0 }
+  if$
+}
+
+FUNCTION {or}
+{   { pop$ #1 }
+    'skip$
+  if$
+}
+
+FUNCTION {field.or.null}
+{ duplicate$ empty$
+    { pop$ "" }
+    'skip$
+  if$
+}
+
+FUNCTION {emphasize}
+{ duplicate$ empty$
+    { pop$ "" }
+    { "{\em " swap$ * "}" * }
+  if$
+}
+
+FUNCTION {embolden}
+{ duplicate$ empty$
+    { pop$ "" }
+    { "{\bf " swap$ * "}" * }
+  if$
+}
+
+%%ORIGINAL KEPT HERE FOR REFERENCE:
+%%FUNCTION {quote}
+%%{ duplicate$ empty$
+%%  { pop$ "" }
+%%  { "`" swap$ * "'" * }
+%% if$
+%%}
+
+%%USE GUILLEMETS
+FUNCTION {quote}
+{ duplicate$ empty$
+    { pop$ "" }
+    { "«" swap$ * "»" * }
+  if$
+}
+%%END USE GUILLEMETS
+
+FUNCTION {write.url}
+{ URL empty$
+    { skip$ }
+    { "\newline\harvardurl{" URL * "}" * write$ newline$ }
+  if$
+}
+
+INTEGERS { nameptr namesleft numnames }
+
+FUNCTION {format.names}
+{ 's :=
+  'f :=
+  #1 'nameptr :=
+  s num.names$ 'numnames :=
+  numnames 'namesleft :=
+    { namesleft #0 > }
+    { s nameptr f format.name$ 't :=
+      nameptr #1 >
+	{ namesleft #1 >
+	    { ", " * t * }
+	    { t "others" =
+		{ " et~al." * }
+		{ " \harvardand\ " * t * }
+	      if$
+	    }
+	  if$
+	}
+	't
+      if$
+      nameptr #1 + 'nameptr :=
+      namesleft #1 - 'namesleft :=
+    }
+  while$
+}
+
+FUNCTION {format.authors}
+{ author empty$
+    { "" }
+    { "{vv~}{ll}{, jj}{, f.}" author format.names }
+  if$
+}
+
+FUNCTION {format.editors}
+{ editor empty$
+    { "" }
+    { "{vv~}{ll}{, jj}{, f.}" editor format.names
+      editor num.names$ #1 >
+	{ ", eds" * }
+	{ ", ed." * }
+      if$
+    }
+  if$
+}
+
+FUNCTION {format.editors.reverse}
+{ editor empty$
+    { "" }
+    { "{f.~}{vv~}{ll}{, jj}" editor format.names
+      editor num.names$ #1 >
+	{ ", eds" * }
+	{ ", ed." * }
+      if$
+    }
+  if$
+}
+
+%%ORIGINAL KEPT HERE FOR REFERENCE:
+%%FUNCTION {format.title}
+%%{ title empty$
+%%    { "" }
+%%    { title "t" change.case$ }
+%%  if$
+%%}
+
+%%REMOVE SINGLE QUOTES
+FUNCTION {format.title}
+{ title empty$
+    { "" }
+    { title "t" change.case$ quote}
+  if$
+}
+%%END REMOVE SINGLE QUOTES
+
+FUNCTION {n.dashify}
+{ 't :=
+  ""
+    { t empty$ not }
+    { t #1 #1 substring$ "-" =
+	{ t #1 #2 substring$ "--" = not
+	    { "--" *
+	      t #2 global.max$ substring$ 't :=
+	    }
+	    {   { t #1 #1 substring$ "-" = }
+		{ "-" *
+		  t #2 global.max$ substring$ 't :=
+		}
+	      while$
+	    }
+	  if$
+	}
+	{ t #1 #1 substring$ *
+	  t #2 global.max$ substring$ 't :=
+	}
+      if$
+    }
+  while$
+}
+
+FUNCTION {format.btitle}
+{ title emphasize
+}
+
+FUNCTION {tie.or.space.connect}
+{ duplicate$ text.length$ #3 <
+    { "~" }
+    { " " }
+  if$
+  swap$ * *
+}
+
+FUNCTION {either.or.check}
+{ empty$
+    'pop$
+    { "can't use both " swap$ * " fields in " * cite$ * warning$ }
+  if$
+}
+
+FUNCTION {format.bvolume}
+{ volume empty$
+    { "" }
+    { "Vol." volume tie.or.space.connect
+      series empty$
+	'skip$
+	{ " of " * series emphasize * }
+      if$
+      "volume and number" number either.or.check
+    }
+  if$
+}
+
+FUNCTION {format.number.series}
+{ volume empty$
+    { number empty$
+	{ series field.or.null }
+	{ output.state mid.sentence =
+	    { "number" }
+	    { "Number" }
+	  if$
+	  number tie.or.space.connect
+	  series empty$
+	    { "there's a number but no series in " cite$ * warning$ }
+	    { " {\em in} " * series quote * }
+	  if$
+	}
+      if$
+    }
+    { "" }
+  if$
+}
+
+FUNCTION {format.edition}
+{ edition empty$
+    { "" }
+    { output.state mid.sentence =
+	{ edition "l" change.case$ " edn" * }
+	{ edition "t" change.case$ " edn" * }
+      if$
+    }
+  if$
+}
+
+INTEGERS { multiresult }
+
+FUNCTION {multi.page.check}
+{ 't :=
+  #0 'multiresult :=
+    { multiresult not
+      t empty$ not
+      and
+    }
+    { t #1 #1 substring$
+      duplicate$ "-" =
+      swap$ duplicate$ "," =
+      swap$ "+" =
+      or or
+	{ #1 'multiresult := }
+	{ t #2 global.max$ substring$ 't := }
+      if$
+    }
+  while$
+  multiresult
+}
+
+FUNCTION {format.pages}
+{ pages empty$
+    { "" }
+    { pages multi.page.check
+	{ "pp.~" pages n.dashify * }
+	{ "p.~" pages * }
+      if$
+    }
+  if$
+}
+
+FUNCTION {format.vol.num.pages}
+{ volume embolden field.or.null
+  number empty$
+    'skip$
+    { "(" number * ")" * *
+      volume empty$
+	{ "there's a number but no volume in " cite$ * warning$ }
+	'skip$
+      if$
+    }
+  if$
+  pages empty$
+    'skip$
+    { duplicate$ empty$
+	{ pop$ format.pages }
+	{ ",~" * pages n.dashify * }
+      if$
+    }
+  if$
+}
+
+FUNCTION {format.chapter.pages}
+{ chapter empty$
+    'format.pages
+    { type empty$
+	{ "chapter" }
+	{ type "l" change.case$ }
+      if$
+      chapter tie.or.space.connect
+      pages empty$
+	'skip$
+	{ ", " * format.pages * }
+      if$
+    }
+  if$
+}
+
+%%REMOVE ITALICS FROM WORD "IN"
+FUNCTION {format.in.ed.booktitle}
+{ booktitle empty$
+    { "" }
+    { editor empty$
+	%%{ "{\em in} " booktitle * } ORIGINAL
+	{ "{in} " booktitle * }
+	%%{ "{\em in} " format.editors.reverse * ", " * booktitle * } ORIGINAL
+	{ "{in} " format.editors.reverse * ", " * booktitle * }
+      if$
+    }
+  if$
+}
+%%END REMOVE ITALICS FROM WORD "IN"
+
+FUNCTION {empty.misc.check}
+{ author empty$ title empty$ howpublished empty$
+  month empty$ year empty$ note empty$
+  and and and and and
+  key empty$ not and
+    { "all relevant fields are empty in " cite$ * warning$ }
+    'skip$
+  if$
+}
+
+FUNCTION {format.thesis.type}
+{ type empty$
+    'skip$
+    { pop$
+      type "t" change.case$
+    }
+  if$
+}
+
+FUNCTION {format.tr.number}
+{ type empty$
+    { "Technical Report" }
+    'type
+  if$
+  number empty$
+    { "t" change.case$ }
+    { number tie.or.space.connect }
+  if$
+}
+
+FUNCTION {format.article.crossref}
+{ key empty$
+    { journal empty$
+	{ "need key or journal for " cite$ * " to crossref " * crossref *
+	  warning$
+	  ""
+	}
+	{ "in {\em " journal * "\/} \cite{" * crossref * "}" *}
+      if$
+    }
+    { "{\em in} \citeasnoun{" crossref * "}" * }
+  if$
+ 
+}
+
+FUNCTION {format.book.crossref}
+{ volume empty$
+    { "empty volume in " cite$ * "'s crossref of " * crossref * warning$
+      "in "
+    }
+    { "Vol." volume tie.or.space.connect
+      " of " *
+    }
+  if$
+  editor empty$
+  editor field.or.null author field.or.null =
+  or
+    { key empty$
+	{ series empty$
+	    { "need editor, key, or series for " cite$ * " to crossref " *
+	      crossref * warning$
+	      "" *
+	    }
+	    { "{\em " * series * "\/} \cite{" * crossref * "}" *}
+	  if$
+	}
+	{ " \citeasnoun{" * crossref * "}" * }
+      if$
+    }
+    { " \citeasnoun{" * crossref * "}" * }
+  if$
+}
+
+FUNCTION {format.incoll.inproc.crossref}
+{ editor empty$
+  editor field.or.null author field.or.null =
+  or
+    { key empty$
+	{ booktitle empty$
+	    { "need editor, key, or booktitle for " cite$ * " to crossref " *
+	      crossref * warning$
+	      ""
+	    }
+	   { "in {\em " booktitle * "\/}" * " \cite{" * crossref * "}" *}
+	    
+	  if$
+	}
+	{ "{\em in} \citeasnoun{" crossref * "}" * }
+      if$
+    }
+    { "{\em in} \citeasnoun{" crossref * "}" * }
+  if$
+  
+}
+
+INTEGERS { len }
+
+FUNCTION {chop.word}
+{ 's :=
+  'len :=
+  s #1 len substring$ =
+    { s len #1 + global.max$ substring$ }
+    's
+  if$
+}
+
+INTEGERS { ind tsslen }
+
+STRINGS { tss ret rss istr }
+
+FUNCTION {replace.substring}{
+  'rss :=
+  'tss :=
+  'istr :=
+  "" 'ret :=
+  tss text.length$ 'tsslen :=
+  #1 'ind :=
+    { istr ind tsslen substring$ "" = not }
+    { istr ind tsslen substring$ tss =
+        { ret rss * 'ret :=
+          ind tsslen + 'ind :=
+        }
+        { ret istr ind #1 substring$ * 'ret :=
+          ind #1 + 'ind :=
+        }
+      if$
+    }
+  while$
+  ret
+}
+
+FUNCTION {format.lab.names.abbr}
+{ 's :=
+  s num.names$ 'numnames :=
+  numnames #1 >
+    { numnames #2 >
+	{ s #1 "{vv~}{ll}" format.name$ " et~al." * }
+	{ s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+            { s #1 "{vv~}{ll}" format.name$ " et~al." * }
+	    { s #1 "{vv~}{ll}" format.name$ " \harvardand\ " *
+              s #2 "{vv~}{ll}" format.name$ * 
+            }
+          if$
+        }
+      if$
+    }
+    { s #1 "{vv~}{ll}" format.name$ }
+  if$
+}
+
+FUNCTION {format.lab.names.full}
+{ 's :=
+  #1 'nameptr :=
+  s num.names$ 'numnames :=
+  numnames 'namesleft :=
+    { namesleft #0 > }
+    { s nameptr "{vv~}{ll}" format.name$ 't :=
+      nameptr #1 >
+	{ namesleft #1 >
+	    { ", " * t * }
+	    { t "others" =
+		{ " et~al." * }
+		{ " \harvardand\ " * t * }
+	      if$
+	    }
+	  if$
+	}
+	't
+      if$
+      nameptr #1 + 'nameptr :=
+      namesleft #1 - 'namesleft :=
+    }
+  while$
+}
+
+INTEGERS { author.field editor.field organization.field title.field key.field }
+
+FUNCTION {init.field.constants}
+{ #0 'author.field :=
+  #1 'editor.field :=
+  #2 'organization.field :=
+  #3 'title.field :=
+  #4 'key.field :=
+}
+
+FUNCTION {make.list.label}
+{ author.field field.used =
+    { format.authors }
+    { editor.field field.used =
+        { format.editors }
+        { organization.field field.used =
+            { "The " #4 organization chop.word #3 text.prefix$ }
+            { title.field field.used =
+                { format.btitle }
+                { key.field field.used =
+                    { key #3 text.prefix$ }
+                    { "Internal error :001 on " cite$ * " label" * warning$ }
+                  if$
+                }
+              if$
+            }
+          if$
+        }
+      if$
+    }
+  if$
+}
+
+FUNCTION {make.full.label}
+{ author.field field.used =
+    { author format.lab.names.full }
+    { editor.field field.used =
+        { editor format.lab.names.full }
+        { organization.field field.used =
+            { "The " #4 organization chop.word #3 text.prefix$ }
+            { title.field field.used =
+                { format.btitle }
+                { key.field field.used =
+                    { key #3 text.prefix$ }
+                    { "Internal error :001 on " cite$ * " label" * warning$ }
+                  if$
+                }
+              if$
+            }
+          if$
+        }
+      if$
+    }
+  if$
+}
+
+FUNCTION {make.abbr.label} %%%XXX change
+{
+  etal.allowed
+    { author.field field.used =
+        { author format.lab.names.abbr }
+        { editor.field field.used =
+            { editor format.lab.names.abbr }
+            { organization.field field.used =
+                { "The " #4 organization chop.word #3 text.prefix$ }
+                { title.field field.used =
+                    { format.btitle }
+                    { key.field field.used =
+                        { key #3 text.prefix$ }
+                        {"Internal error :001 on " cite$ * " label" * warning$ }
+                      if$
+                    }
+                  if$
+                }
+              if$
+            }
+          if$
+        }
+      if$
+    }
+    { make.full.label }
+  if$
+}
+
+FUNCTION {output.bibitem}
+{ newline$
+  etal.allowed        %%%XXX change
+  etal.required
+  and
+    {
+      "\harvarditem[" write$
+      make.abbr.label write$
+      "]{" write$
+    }
+    {
+      "\harvarditem{" write$
+    }
+  if$
+  make.full.label write$
+  "}{" write$
+  list.year write$
+  "}{" write$
+  cite$ write$
+  "}" write$
+  newline$
+  ""
+  before.all 'output.state :=
+}
+
+FUNCTION {list.label.output}
+{ make.list.label " " * write$
+}
+
+FUNCTION {article}
+{ output.bibitem
+  list.label.output
+  " \harvardyearleft " list.year * "\harvardyearright " * output.nonnull
+  author "author" item.check
+  title.field field.used =
+    { skip$ }
+    { format.title "title" output.check }
+  if$
+  crossref missing$
+    { journal emphasize "journal" duplicate$ item.check
+      " " * format.vol.num.pages * output
+    }
+    { format.article.crossref output.nonnull
+      format.pages output
+    }
+  if$
+  new.block
+  note output
+  fin.entry
+  write.url
+}
+
+FUNCTION {book}
+{ output.bibitem
+  list.label.output
+  " \harvardyearleft " list.year * "\harvardyearright " * output.nonnull
+  author empty$
+    { editor "author and editor" item.check }
+    { crossref missing$
+	{ "author and editor" editor either.or.check }
+	'skip$
+      if$
+    }
+  if$
+  title.field field.used =
+    { skip$ }
+    { format.btitle "title" output.check }
+  if$
+  crossref missing$
+    { format.bvolume output
+      format.number.series output
+      format.edition output
+      publisher "publisher" output.check
+      address output
+    }
+    { format.book.crossref output.nonnull
+      format.edition output
+    }
+  if$
+  new.block
+  note output
+  fin.entry
+  write.url
+}
+
+FUNCTION {booklet}
+{ output.bibitem
+  list.label.output
+  " \harvardyearleft " list.year * "\harvardyearright " * output.nonnull
+  title.field field.used =
+    { skip$ }
+    { format.title "title" output.check }
+  if$
+  howpublished output
+  address output
+  new.block
+  note output
+  fin.entry
+  write.url
+}
+
+FUNCTION {inbook}
+{ output.bibitem
+  list.label.output
+  " \harvardyearleft " list.year * "\harvardyearright " * output.nonnull
+  author empty$
+    { editor "author and editor" item.check }
+    { crossref missing$
+	{ "author and editor" editor either.or.check }
+	'skip$
+      if$
+    }
+  if$
+  title.field field.used =
+    { skip$ }
+    { format.btitle "title" output.check }
+  if$
+  crossref missing$
+    { format.bvolume output
+      format.number.series output
+      format.edition output
+      publisher "publisher" output.check
+      address output
+    }
+    { format.book.crossref output.nonnull
+      format.edition output
+    }
+  if$
+  format.chapter.pages "chapter and pages" output.check
+  new.block
+  note output
+  fin.entry
+  write.url
+}
+
+FUNCTION {incollection}
+{ output.bibitem
+  list.label.output
+  " \harvardyearleft " list.year * "\harvardyearright " * output.nonnull
+  title.field field.used =
+    { skip$ }
+    { format.title "title" output.check }
+  if$
+  author "author" item.check
+  crossref missing$
+    { format.in.ed.booktitle "booktitle" output.check
+      format.edition output
+      format.bvolume output
+      format.number.series output
+      publisher "publisher" output.check
+      address output
+    }
+    { format.incoll.inproc.crossref output.nonnull
+    }
+  if$
+  format.chapter.pages output
+  new.block
+  note output
+  fin.entry
+  write.url
+}
+
+FUNCTION {inproceedings}
+{ output.bibitem
+  list.label.output
+  " \harvardyearleft " list.year * "\harvardyearright " * output.nonnull
+  title.field field.used =
+    { skip$ }
+    { format.title "title" output.check }
+  if$
+  author "author" item.check
+  crossref missing$
+    { format.in.ed.booktitle "booktitle" output.check
+      format.bvolume output
+      format.number.series output
+      address empty$
+	{ organization output
+	  publisher output
+	}
+	{ organization output
+	  publisher output
+          address output.nonnull
+ 	}
+      if$
+    }
+    { format.incoll.inproc.crossref output.nonnull
+    }
+  if$
+  format.pages output
+  new.block
+  note output
+  fin.entry
+  write.url
+}
+
+FUNCTION {conference} { inproceedings }
+
+FUNCTION {manual}
+{ output.bibitem
+  list.label.output
+  " \harvardyearleft " list.year * "\harvardyearright " * output.nonnull
+  title.field field.used =
+    { skip$ }
+    { format.btitle "title" output.check }
+  if$
+  format.edition output
+  author empty$
+    { organization empty$
+	{ address output }
+	'skip$
+      if$
+    }
+    { organization output
+      address output
+    }
+  if$
+  new.block
+  note output
+  fin.entry
+  write.url
+}
+
+FUNCTION {mastersthesis}
+{ output.bibitem
+  list.label.output
+  " \harvardyearleft " list.year * "\harvardyearright " * output.nonnull
+  author "author" item.check
+  title.field field.used =
+    { skip$ }
+    { format.title "title" output.check }
+  if$
+  "Master's thesis" format.thesis.type output.nonnull
+  school "school" output.check
+  address output
+  new.block
+  note output
+  fin.entry
+  write.url
+}
+
+FUNCTION {misc}
+{ output.bibitem
+  list.label.output
+  " \harvardyearleft " list.year * "\harvardyearright " * output.nonnull
+  title.field field.used =
+    { skip$ }
+    { format.title output }
+  if$
+  howpublished output
+  new.block
+  note output
+  fin.entry
+  write.url
+  empty.misc.check
+}
+
+FUNCTION {phdthesis}
+{ output.bibitem
+  list.label.output
+  " \harvardyearleft " list.year * "\harvardyearright " * output.nonnull
+  author "author" item.check
+  title.field field.used =
+    { skip$ }
+    { title "title" output.check }
+  if$
+  "PhD thesis" format.thesis.type output.nonnull
+  school "school" output.check
+  address output
+  new.block
+  note output
+  fin.entry
+  write.url
+}
+
+FUNCTION {proceedings}
+{ output.bibitem
+  list.label.output
+  " \harvardyearleft " list.year * "\harvardyearright " * output.nonnull
+  title.field field.used =
+    { skip$ }
+    { format.btitle "title" output.check }
+  if$
+  format.bvolume output
+  format.number.series output
+  address empty$
+    { editor empty$
+	{ skip$ }
+	{ organization output
+	}
+      if$
+      publisher output
+    }
+    { editor empty$
+	'skip$
+	{ organization output }
+      if$
+      publisher output
+      address output.nonnull
+    }
+  if$
+  new.block
+  note output
+  fin.entry
+  write.url
+}
+
+FUNCTION {techreport}
+{ output.bibitem
+  list.label.output
+  " \harvardyearleft " list.year * "\harvardyearright " * output.nonnull
+  author "author" item.check
+  title.field field.used =
+    { skip$ }
+    { format.title "title" output.check }
+  if$
+  format.tr.number output.nonnull
+  institution "institution" output.check
+  address output
+  new.block
+  note output
+  fin.entry
+  write.url
+}
+
+FUNCTION {unpublished}
+{ output.bibitem
+  list.label.output
+  " \harvardyearleft " list.year * "\harvardyearright " * output.nonnull
+  author "author" item.check
+  title.field field.used =
+    { skip$ }
+    { format.title "title" output.check }
+  if$
+  new.block
+  note "note" output.check
+  fin.entry
+  write.url
+}
+
+FUNCTION {default.type} { misc }
+
+MACRO {jan} {"January"}
+
+MACRO {feb} {"February"}
+
+MACRO {mar} {"March"}
+
+MACRO {apr} {"April"}
+
+MACRO {may} {"May"}
+
+MACRO {jun} {"June"}
+
+MACRO {jul} {"July"}
+
+MACRO {aug} {"August"}
+
+MACRO {sep} {"September"}
+
+MACRO {oct} {"October"}
+
+MACRO {nov} {"November"}
+
+MACRO {dec} {"December"}
+
+MACRO {acmcs} {"ACM Computing Surveys"}
+
+MACRO {acta} {"Acta Informatica"}
+
+MACRO {cacm} {"Communications of the ACM"}
+
+MACRO {ibmjrd} {"IBM Journal of Research and Development"}
+
+MACRO {ibmsj} {"IBM Systems Journal"}
+
+MACRO {ieeese} {"IEEE Transactions on Software Engineering"}
+
+MACRO {ieeetc} {"IEEE Transactions on Computers"}
+
+MACRO {ieeetcad}
+ {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"}
+
+MACRO {ipl} {"Information Processing Letters"}
+
+MACRO {jacm} {"Journal of the ACM"}
+
+MACRO {jcss} {"Journal of Computer and System Sciences"}
+
+MACRO {scp} {"Science of Computer Programming"}
+
+MACRO {sicomp} {"SIAM Journal on Computing"}
+
+MACRO {tocs} {"ACM Transactions on Computer Systems"}
+
+MACRO {tods} {"ACM Transactions on Database Systems"}
+
+MACRO {tog} {"ACM Transactions on Graphics"}
+
+MACRO {toms} {"ACM Transactions on Mathematical Software"}
+
+MACRO {toois} {"ACM Transactions on Office Information Systems"}
+
+MACRO {toplas} {"ACM Transactions on Programming Languages and Systems"}
+
+MACRO {tcs} {"Theoretical Computer Science"}
+
+READ
+
+EXECUTE {init.field.constants}
+
+FUNCTION {sortify}
+{ purify$
+  "l" change.case$
+}
+
+FUNCTION {sortify.names}
+{ " \harvardand\ " " " replace.substring
+  " et~al." " zzz" replace.substring
+  sortify
+}
+
+FUNCTION {author.key.label}
+{ author empty$
+    { key empty$
+	{ title.field 'field.used := }
+	{ key.field 'field.used := }
+      if$
+    }
+    { author.field 'field.used := }
+  if$
+}
+
+FUNCTION {author.editor.key.label}
+{ author empty$
+    { editor empty$
+	{ key empty$
+	    { title.field 'field.used := }
+	    { key.field 'field.used := }
+	  if$
+  	}
+	{ editor.field 'field.used := }
+      if$
+    }
+    { author.field 'field.used := }
+  if$
+}
+
+FUNCTION {author.key.organization.label}
+{ author empty$
+    { key empty$
+	{ organization empty$
+	    { title.field 'field.used := }
+	    { organization.field 'field.used := }
+	  if$
+	}
+	{ key.field 'field.used := }
+      if$
+    }
+    { author.field 'field.used := }
+  if$
+}
+
+FUNCTION {editor.key.organization.label}
+{ editor empty$
+    { key empty$
+	{ organization empty$
+	    { title.field 'field.used := }
+	    { organization.field 'field.used := }
+	  if$
+	}
+	{ key.field 'field.used := }
+      if$
+    }
+    { editor.field 'field.used := }
+  if$
+}
+
+FUNCTION {sort.format.title}
+{ 't :=
+  "A " #2
+    "An " #3
+      "The " #4 t chop.word
+    chop.word
+  chop.word
+  sortify
+  #1 global.max$ substring$
+}
+
+FUNCTION {calc.label} %%%XXX change
+{ make.abbr.label
+  title.field field.used =
+    { sort.format.title }
+    { sortify.names }
+  if$
+  year field.or.null purify$ #-1 #4 substring$ sortify
+  *
+  'sort.label :=
+}
+
+FUNCTION {preliminaries} %%%XXX change
+{ type$ "book" =
+  type$ "inbook" =
+  or
+    'author.editor.key.label
+    { type$ "proceedings" =
+	'editor.key.organization.label
+	{ type$ "manual" =
+	    'author.key.organization.label
+	    'author.key.label
+	  if$
+	}
+      if$
+    }
+  if$
+  author.field field.used = %%%XXX change
+    {
+      author num.names$ #2 >
+        { #1 }
+        { #0 }
+      if$
+      'etal.required :=
+    }
+    {
+      editor.field field.used = 
+        {
+          editor num.names$ #2 >
+            { #1 }
+            { #0 }
+          if$
+        }
+        { #0 }
+      if$
+      'etal.required :=
+    }
+  if$
+  #1 'etal.allowed :=
+}
+
+FUNCTION {first.presort}
+{ calc.label
+  sort.label
+  title.field field.used =
+    { skip$ }
+    { "    "
+      *
+      make.list.label sortify.names
+      *
+      "    "
+      *
+      title field.or.null
+      sort.format.title
+      *
+    }
+  if$
+  #1 entry.max$ substring$
+  'sort.key$ :=
+}
+
+ITERATE {preliminaries}
+
+ITERATE {first.presort}
+
+SORT
+
+STRINGS { last.sort.label next.extra last.full.label}
+
+INTEGERS { last.extra.num last.etal.allowed}
+
+FUNCTION {initialize.confusion}
+{ #0 int.to.chr$ 'last.sort.label :=
+  #0 int.to.chr$ 'last.full.label :=
+  #1 'last.etal.allowed :=
+}
+
+FUNCTION {confusion.pass}
+{ last.sort.label sort.label =
+    { last.etal.allowed 
+        { last.full.label make.full.label sortify.names =
+            { skip$ }
+            { #0 'etal.allowed :=
+              #0 'last.etal.allowed :=
+            }
+          if$
+        }
+        { #0 'etal.allowed := }
+      if$
+    }
+    { sort.label 'last.sort.label :=
+      make.full.label sortify.names 'last.full.label :=
+      #1 'last.etal.allowed :=
+    }
+  if$
+}
+
+EXECUTE {initialize.confusion}
+
+ITERATE {confusion.pass}
+
+EXECUTE {initialize.confusion}
+
+REVERSE {confusion.pass}
+
+FUNCTION {initialize.last.extra.num}
+{ #0 int.to.chr$ 'last.sort.label :=
+  "" 'next.extra :=
+  #0 'last.extra.num :=
+}
+
+FUNCTION {forward.pass}
+{ last.sort.label sort.label =
+    { last.extra.num #1 + 'last.extra.num :=
+      last.extra.num int.to.chr$ 'extra.label :=
+    }
+    { "a" chr.to.int$ 'last.extra.num :=
+      "" 'extra.label :=
+      sort.label 'last.sort.label :=
+    }
+  if$
+}
+
+FUNCTION {reverse.pass}
+{ next.extra "b" =
+    { "a" 'extra.label := }
+    'skip$
+  if$
+  year empty$
+    { "n.d." extra.label emphasize * 'list.year := }
+    { year extra.label emphasize * 'list.year := }
+  if$
+  extra.label 'next.extra :=
+}
+
+ITERATE {first.presort}
+
+SORT
+
+EXECUTE {initialize.last.extra.num}
+
+ITERATE {forward.pass}
+
+REVERSE {reverse.pass}
+
+FUNCTION {second.presort}
+{ make.list.label
+  title.field field.used =
+    { sort.format.title }
+    { sortify.names }
+  if$
+  "    "
+  *
+  list.year field.or.null sortify
+  *
+  "    "
+  *
+  title.field field.used =
+    { skip$ }
+    { title field.or.null
+      sort.format.title
+      *
+    }
+  if$
+  #1 entry.max$ substring$
+  'sort.key$ :=
+}
+
+ITERATE {second.presort}
+
+SORT
+
+FUNCTION {begin.bib}
+{ preamble$ empty$
+    'skip$
+    { preamble$ write$ newline$ }
+  if$
+  "\begin{thebibliography}{xx}" write$ newline$
+}
+
+EXECUTE {begin.bib}
+
+EXECUTE {init.state.consts}
+
+ITERATE {call.type$}
+
+FUNCTION {end.bib}
+{ newline$
+  "\end{thebibliography}" write$ newline$
+}
+
+EXECUTE {end.bib}
diff --git a/doc/cbdc-it/cbdc-it.bib b/doc/cbdc-it/cbdc-it.bib
index 8320957a5..639bb0c45 100644
--- a/doc/cbdc-it/cbdc-it.bib
+++ b/doc/cbdc-it/cbdc-it.bib
@@ -1,7 +1,9 @@
+%% To be used with modified bibliography style agsm-mod + hyperref + natbib + italian babel
+
 @article{Adrian,
   author        = {Adrian, Tobias and Mancini-Griffoli},
   year          = {2019},
-  title         = {The Rise of Digital Money},
+  title         = {{The Rise of Digital Money}},
   journal       = {IMF Fintech Note},
   volume        = {19/01},
 }
@@ -9,7 +11,7 @@
 @article{Agarwal,
   author        = {Agarwal, Ruchir and Miles S. Kimball},
   year          = {2019},
-  title         = {Enabling Deep Negative Rates to Fight Recessions: A Guide},
+  title         = {{Enabling Deep Negative Rates to Fight Recessions: A Guide}},
   journal       = {IMF Working Paper},
   volume        = {19/84},
 }
@@ -18,7 +20,7 @@
 @article{Agur,
   author        = {Agur, Itai and Anil Ari and Giovanni Dell'Ariccia},
   year          = {2019},
-  title         = {Designing Central Bank Digital Currencies},
+  title         = {{Designing Central Bank Digital Currencies}},
   journal       = {IMF Working Paper},
   volume        = {19/252},
 }
@@ -26,7 +28,7 @@
 @article{Allen,
   author        = {Allen, Sarah and Srđjan Čapkun and Ittay Eyal and Giulia Fanti and Bryan A. Ford and James Grimmelmann and Ari Juels and Kari Kostiainen and Sarah Meiklejohn and Andrew Miller and Eswar Prasad and Karl Wüst and Fan Zhang},
   year          = {2020},
-  title         = {Design Choices for Central Bank Digital Currency: Policy and Technical Considerations},
+  title         = {{Design Choices for Central Bank Digital Currency: Policy and Technical Considerations}},
   journal       = {NBER Working Paper},
   volume        = {27634},
 }
@@ -35,7 +37,7 @@
   author        = {Alves, Tiago and Don Felton},
   year          = {2004},
   title         = {TrustZone: Integrated hardware and software security},
-  journal       = {\textit{ARM IQ}},
+  journal       = {ARM IQ},
   volume        = {3},
   number        = {4},
   pages         = {18--24},
@@ -45,7 +47,7 @@
   author        = {Auer, Raphael and Rainer Böhme},
   year          = {2020},
   title         = {The technology of retail central bank digital currency},
-  journal       = {\textit{BIS Quarterly Review}},
+  journal       = {BIS Quarterly Review},
   month         = {March},
   pages         = {85--96},
 }
@@ -53,8 +55,8 @@
 @article{AuerCornelli,
   author        = {Auer, Raphael and Giulio Cornelli and Jon Frost},
   year          = {2020},
-  title         = {Taking stock: ongoing retail {CBDC} projects},
-  journal       = {\textit{BIS Quarterly Review}},
+  title         = {{Taking stock: ongoing retail CBDC projects}},
+  journal       = {BIS Quarterly Review},
   month         = {March},
   pages         = {97--98},
 }
@@ -62,21 +64,21 @@
 @booklet{BIS,
   author        = {{Bank for International Settlements}},
   year          = {2018},
-  title         = {Central Bank Digital Currencies. Joint Report of the Committee on Payments and Market Infrastructures and Markets Committee},
+  title         = {{Central Bank Digital Currencies. Joint Report of the Committee on Payments and Market Infrastructures and Markets Committee}},
 }
 
 @booklet{BoE,
   author        = {{Bank of England}},
   year          = {2020},
-  title         = {Central Bank Digital Currency: Opportunities, Challenges and Design. Discussion Paper},
+  title         = {{Central Bank Digital Currency: Opportunities, Challenges and Design. Discussion Paper}},
   month         = {March},
 }
 
 @article{Baiocchi,
   author        = {Baiocchi, Giovanni and Walter Distaso},
   year          = {2003},
-  title         = {{GRETL}: Econometric Software for the {GNU} Generation},
-  journal       = {\textit{Journal of Applied Econometrics}},
+  title         = {{GRETL: Econometric Software for the GNU Generation}},
+  journal       = {Journal of Applied Econometrics},
   volume        = {18},
   pages         = {105-110},
 }
@@ -85,7 +87,7 @@
   author        = {Bech, Morten and Rodney Garratt},
   year          = {2017},
   title         = {Central bank cryptocurrencies},
-  journal       = {\textit{BIS Quarterly Review}},
+  journal       = {BIS Quarterly Review},
   month         = {September},
   pages         = {55--70},
 }
@@ -93,8 +95,8 @@
 @article{Berentsen,
   author        = {Berentsen, Aleksander and Fabian Schär},
   year          = {2018},
-  title         = {The Case for Central Bank Electronic Money and the Non-case for Central Bank Cryptocurrencies},
-  journal       = {\textit{Federal Reserve Bank of St. Louis Review}},
+  title         = {{The Case for Central Bank Electronic Money and the Non-case for Central Bank Cryptocurrencies}},
+  journal       = {Federal Reserve Bank of St. Louis Review},
   volume        = {100},
   number        = {2},
   pages         = {97--106},
@@ -103,15 +105,15 @@
 @article{Bernstein2020,
   author        = {Bernstein, Daniel J. and Tanja Lange},
   year          = {2020},
-  title         = {{eBACS}: {ECRYPT} Benchmarking of Cryptographic Systems},
-  url           = {\url{https://bench.cr.yp.to}, accessed 17 March 2020},
+  title         = {{eBACS: ECRYPT Benchmarking of Cryptographic Systems}},
+  url           = {\url{https://bench.cr.yp.to}, consultato il 17 marzo 2020},
 }
 
 @article{Bernstein2012,
   author        = {Bernstein, Daniel J. and Niels Duif and Tanja Lange and Peter Schwabe and Bo-Yin Yang},
   year          = {2012},
   title         = {High-speed high-security signatures},
-  journal       = {\textit{Journal of Cryptographic Engineering}},
+  journal       = {Journal of Cryptographic Engineering},
   volume        = {2},
   pages         = {77--89},
 }
@@ -119,7 +121,7 @@
 @InCollection{Bindseil,
   author        = {Bindseil, Ulrich},
   year          = {2020},
-  title         = {Tiered {CBDC} and the financial system},
+  title         = {{Tiered CBDC and the financial system}},
   publisher     = {European Central Bank},
   series        = {ECB Working Paper},
   number        = {2351},
@@ -137,8 +139,8 @@
 @article{Boneh,
   author        = {Boneh, Dan},
   year          = {1999},
-  title         = {Twenty Years of Attacks on the {RSA} Cryptosystem},
-  journal       = {\textit{Notices of the AMS}},
+  title         = {{Twenty Years of Attacks on the RSA Cryptosystem}},
+  journal       = {Notices of the AMS},
   volume        = {42},
   number        = {2},
   pages         = {202--213},
@@ -156,8 +158,8 @@
 @article{Brunnermeier,
   author        = {Brunnermeier, Markus and Dirk Niepelt},
   year          = {2019},
-  title         = {On the Equivalence of Private and Public Money},
-  journal       = {\textit{Journal of Monetary Economics}},
+  title         = {{On the Equivalence of Private and Public Money}},
+  journal       = {Journal of Monetary Economics},
   volume        = {106},
   pages         = {27--41},
 }
@@ -165,8 +167,8 @@
 @article{Buiter,
   author        = {Buiter, Willem H. and Nikolaos Panigirtzoglou},
   year          = {2003},
-  title         = {Overcoming the Zero Bound on Nominal Interest Rates with Negative Interest on Currency: Gesell's Solution},
-  journal       = {\textit{The Economic Journal}},
+  title         = {{Overcoming the Zero Bound on Nominal Interest Rates with Negative Interest on Currency: Gesell's Solution}},
+  journal       = {The Economic Journal},
   volume        = {113},
   number        = {490},
   pages         = {723--746},
@@ -184,7 +186,7 @@
 @inproceedings{Camenisch2007,
   author        = {Camenisch, Jan and Aanna Lysyanskaya and Mira Meyerovich},
   year          = {2007},
-  title         = {Endorsed E-Cash},
+  title         = {{Endorsed E-Cash}},
   booktitle     = {\textit{2007 IEEE Symposium on Security and Privacy (SP'07)}},
   month         = {May},
   pages         = {101--115},
@@ -193,7 +195,7 @@
 @inproceedings{Camenisch2005,
   author        = {Camenisch, Jan and Susan Hohenberger and Anna Lysyanskaya},
   year          = {2005},
-  title         = {Compact E-Cash},
+  title         = {{Compact E-Cash}},
   booktitle     = {\textit{Advances in Cryptology -- EUROCRYPT 2005: 24th Annual International Conference on the Theory and Applications of Cryptographic Techniques}},
   address       = {Aarhus, Denmark},
   month         = {May},
@@ -215,15 +217,15 @@
 @misc{CCC,
   author        = {{CCC e.V.}},
   year          = {2017},
-  title         = {Chaos Computer Club hacks e-motor charging stations},
+  title         = {{Chaos Computer Club hacks e-motor charging stations}},
   howpublished  = {34c3},
 }
 
 @article{Chapman,
   author        = {Chapman, James and Rodney Garratt and Scott Hendry and Andrew McCormack and Wade McMahon},
   year          = {2017},
-  title         = {Project {J}asper: Are Distributed Wholesale Payment Systems Feasible Yet?},
-  journal       = {\textit{Financial System Review}},
+  title         = {{Project Jasper: Are Distributed Wholesale Payment Systems Feasible Yet?}},
+  journal       = {Financial System Review},
   publisher     = {Bank of Canada},
   month         = {June},
   pages         = {59--69},
@@ -248,7 +250,7 @@
 @inproceedings{Danezis,
   author        = {Danezis, George and Sarah Meiklejohn},
   year          = {2016},
-  title         = {Centrally Banked Cryptocurrencies},
+  title         = {{Centrally Banked Cryptocurrencies}},
   booktitle     = {\textit{23nd Annual Network and Distributed System Security Symposium, NDSS2016}},
   address       = {San Diego, California, USA},
   month         = {February},
@@ -259,7 +261,7 @@
 @article{Diffie,
   author        = {Diffie, Whitfield and Martin Hellmann},
   year          = {1976},
-  title         = {New Directions in Cryptography},
+  title         = {{New Directions in Cryptography}},
   journal       = {IEEE Trans. on Inf. Theory, IT-22},
   pages         = {644--654},
 }
@@ -267,7 +269,7 @@
 @phdthesis{Dold,
   author        = {Dold, Florian},
   year          = {2019},
-  title         = {The {GNU} {T}aler System: Practical and Provably Secure Electronic Payments. PhD Thesis},
+  title         = {{The GNU Taler System: Practical and Provably Secure Electronic Payments. PhD Thesis}},
   school        = {University of Rennes 1},
 }
 
@@ -275,7 +277,7 @@
   author        = {{European Central Bank}},
   year          = {2019},
   title         = {Exploring anonymity in central bank digital currencies},
-  journal       = {\textit{In Focus}},
+  journal       = {In Focus},
   number        = {4},
   month         = {December},
 }
@@ -284,7 +286,7 @@
   author        = {Fuchsbauer, Georg and David Pointcheval and Damien Vergnaud},
   year          = {2009},
   title         = {Transferable constant-size fair e-cash},
-  booktitle     = {\textit{International Conference on Cryptology and Network Security}},
+  booktitle     = {International Conference on Cryptology and Network Security},
   publisher     = {Springer-Verlag Berlin Heidelberg},
   pages         = {226--247},
 }
@@ -292,15 +294,15 @@
 @inproceedings{Garcia,
   author        = {Garcia, Flavio and Gerhard de Koning Gans and Ruben Muijrers and Peter van Rossum and Roel Verdult and Ronny Wichers Schreur and Bart Jacobs},
   year          = {2008},
-  title         = {Dismantling MIFARE Classic},
+  title         = {{Dismantling MIFARE Classic}},
   booktitle       = {\textit{European Symposium on Research in Computer Security}},
 }
 
 @article{Garratt,
   author        = {Garratt, Rod and Michael Lee and Brendan Malone and Antoine Martin},
   year          = {2020},
-  title         = {Token- or Account-Based? A Digital Currency Can Be Both},
-  journal       = {\textit{Liberty Street Economics}},
+  title         = {{Token- or Account-Based? A Digital Currency Can Be Both}},
+  journal       = {Liberty Street Economics},
   publisher     = {Federal Reserve Bank of New York},
   month         = {August},
   day           = {12},
@@ -309,8 +311,8 @@
 @article{Goodfriend,
   author        = {Goodfriend, Marvin},
   year          = {2000},
-  title         = {Overcoming the Zero Bound on Interest Rate Policy},
-  journal       = {\textit{Journal of Money, Credit, and Banking}},
+  title         = {{Overcoming the Zero Bound on Interest Rate Policy}},
+  journal       = {Journal of Money, Credit, and Banking},
   volume        = {32},
   number        = {4},
   pages         = {1007--1035},
@@ -320,7 +322,7 @@
   author        = {Johnston, Casey},
   year          = {2010},
   title         = {PS3 hacked through poor cryptography implementation},
-  journal       = {\textit{Ars Technica}},
+  journal       = {Ars Technica},
   month         = {December},
   day           = {30},
 }
@@ -338,8 +340,8 @@
 @article{Kahn2009,
   author        = {Kahn, Charles M. and William Roberds},
   year          = {2009},
-  title         = {Why Pay? An Introduction to Payments Economics},
-  journal       = {\textit{Journal of Financial Intermediation}},
+  title         = {{Why Pay? An Introduction to Payments Economics}},
+  journal       = {Journal of Financial Intermediation},
   number        = {18},
   pages         = {1--23},
 }
@@ -347,8 +349,8 @@
 @article{Kahn2005,
   author        = {Kahn, Charles M. and James McAndrews and William Roberds},
   year          = {2005},
-  title         = {Money is Privacy},
-  journal       = {\textit{International Economic Review}},
+  title         = {{Money is Privacy}},
+  journal       = {International Economic Review},
   volume        = {46},
   number        = {2},
   pages         = {377--399},
@@ -358,7 +360,7 @@
   author        = {Kasper, Timo and Michael Silbermann and Christof Paar},
   year          = {2010},
   title         = {All you can eat or breaking a real-world contactless payment system},
-  journal       = {\textit{Financial Cryptography and Data Security, Lecture Notes in Computer Science}},
+  journal       = {Financial Cryptography and Data Security, Lecture Notes in Computer Science},
   volume        = {6052},
   pages         = {343--50},
 }
@@ -366,7 +368,7 @@
 @inproceedings{Katzenbeisser,
   author        = {Katzenbeisser, Stefan and Ünal Kocabaş and Vladimir Rožić and Ahmad-Reza Sadeghi and Ingrid Verbauwhede and Christian Wachsmann},
   year          = {2012},
-  title         = {{PUF}s: Myth, Fact or Busted? A Security Evaluation of Physically Unclonable Functions ({PUF}s) Cast in Silicon},
+  title         = {{PUFs: Myth, Fact or Busted? A Security Evaluation of Physically Unclonable Functions (PUFs) Cast in Silicon}},
   booktitle     = {\textit{Cryptographic Hardware and Embedded Systems -- CHES 2012. Lecture Notes in Computer Science}},
   volume        = {7428},
   pages         = {283--301},
@@ -382,7 +384,7 @@
 @article{Kiff,
   author        = {Kiff, John and Jihad Alwazir and Sonja Davidovic and Aquiles Farias and Ashraf Khan and Tanai Khiaonarong and Majid Malaika and Hunter Monroe and Nobu Sugimoto and Hervé Tourpe and Peter Zhou},
   year          = {2020},
-  title         = {A Survey of Research on Retail Central Bank Digital Currency},
+  title         = {{A Survey of Research on Retail Central Bank Digital Currency}},
   journal       = {IMF Working Paper},
   volume        = {20/104},
 }
@@ -399,7 +401,7 @@
 @inproceedings{Lapid,
   author        = {Lapid, Ben and Avishai Wool},
   year          = {2018},
-  title         = {Cache-Attacks on the {ARM} TrustZone Implementations of {AES}-256 and {AES}-256-{GCM} via {GPU}-Based Analysis},
+  title         = {{Cache-Attacks on the ARM TrustZone Implementations of AES-256 and AES-256-GCM via GPU-Based Analysis}},
   booktitle     = {\textit{International Conference on Selected Areas in Cryptography. Lecture Notes in Computer Science}},
   volume        = {11349},
 }
@@ -407,14 +409,16 @@
 @article{Lerner,
   author        = {Lerner, Josh and Jean Tirole},
   year          = {2005},
-  title         = {The Scope of Open Source Licensing},
-  journal       = {\textit{Journal of Law, Economics \& Organization}},
+  title         = {{The Scope of Open Source Licensing}},
+  journal       = {Journal of Law, Economics \& Organization},
   volume        = {21},
   pages         = {20-56},
 }
 
 @misc{Libra,
-  author        = {{Libra White Paper v2.0}},
+  author        = {{Libra Association}},
+  year          = {2020},
+  title         = {{Libra White Paper v2.0}},
   url           = {\url{https://libra.org/en-US/white-paper}},
 }
 
@@ -429,7 +433,7 @@
 @InCollection{Lyons,
   author        = {Lyons, Richard K. and Ganesh Viswanath-Natraj},
   year          = {2020},
-  title         = {What Keeps Stablecoins Stable?},
+  title         = {{What Keeps Stablecoins Stable?}},
   publisher     = {National Bureau of Economic Research},
   series        = {NBER Working Paper Series},
   number        = {27136},
@@ -439,7 +443,7 @@
 @article{Mancini-Griffoli,
   author        = {Mancini-Griffoli and Maria Soledad Martinez Peria and Itai Agur and Anil Ari and John Kiff and Adina Popescu and Celine Rochon},
   year          = {2018},
-  title         = {Casting Light on Central Bank Digital Currency},
+  title         = {{Casting Light on Central Bank Digital Currency}},
   journal       = {IMF Staff Discussion Notes},
   volume        = {18/08},
   publisher     = {International Monetary Fund},
@@ -448,7 +452,7 @@
 @misc{Nakamoto,
   author        = {Nakamoto, Satoshi},
   year          = {2008},
-  title         = {Bitcoin: A Peer-to-Peer Electronic Cash System},
+  title         = {{Bitcoin: A Peer-to-Peer Electronic Cash System}},
   url           = {\url{https://www.bitcoin.com/bitcoin.pdf}},
 }
 
@@ -463,14 +467,14 @@
   author        = {Niepelt, Dirk},
   year          = {2020},
   title         = {Digital money and central bank digital currency: An executive summary for policymakers},
-  url           = {https://voxeu.org/article/digital-money-and-central-bank-digital-currency-executive-summary},
+  howpublished  = {\url{https://voxeu.org/article/digital-money-and-central-bank-digital-currency-executive-summary}},
 }
 
 @inproceedings{Okamoto,
   author        = {Okamoto, Tatsuaki},
   year          = {1995},
-  title         = {An Efficient Divisible Electronic Cash Scheme},
-  booktitle     = {\textit{Advances in Cryptology --- CRYPT0'95: 15th Annual International Cryptology Conference Santa Barbara, California, USA, August 27--31, 1995 Proceedings}},
+  title         = {{An Efficient Divisible Electronic Cash Scheme}},
+  booktitle     = {\textit{Advances in Cryptology --- CRYPT0'95: 15th Annual International Cryptology Conference Santa Barbara, California, USA, 27--31 agosto, 1995 Proceedings}},
   editor        = {Ed. di Don Coppersmith},
   publisher     = {Springer-Verlag Berlin Heidelberg},
   pages         = {438--451},
@@ -479,7 +483,7 @@
 @article{Pinto,
   author        = {Pinto, S. and N. Santos},
   year          = {2019},
-  title         = {Demystifying {ARM} TrustZone: A Comprehensive Survey},
+  title         = {{Demystifying ARM TrustZone: A Comprehensive Survey}},
   journal       = {ACM Computing Surveys},
   volume        = {51},
   number        = {6},
@@ -490,8 +494,8 @@
 @article{Rivest,
   author        = {Rivest, Ronald L. and Adi Shamir and Leonard Adleman},
   year          = {1978},
-  title         = {A Method for Obtaining Digital Signatures and Public Key Cryptosystems},
-  journal       = {\textit{Comm. ACM}},
+  title         = {{A Method for Obtaining Digital Signatures and Public Key Cryptosystems}},
+  journal       = {Comm. ACM},
   volume        = {21},
   number        = {2},
 }
@@ -506,8 +510,8 @@
 @article{Soukup,
   author        = {Soukup, Michael and Bruno Muff},
   year          = {2007},
-  title         = {Die {P}ostcard lässt sich fälschen},
-  journal       = {\textit{Sonntagszeitung}},
+  title         = {{Die Postcard lässt sich fälschen}},
+  journal       = {Sonntagszeitung},
   month         = {April},
   day           = {22},
 }
@@ -515,8 +519,8 @@
 @article{Stallman,
   author        = {Stallman, Richard},
   year          = {1985},
-  title         = {The {GNU} manifesto},
-  journal       = {\textit{Dr. Dobb's Journal of Software Tools}},
+  title         = {{The GNU manifesto}},
+  journal       = {Dr. Dobb's Journal of Software Tools},
   volume        = {10},
   number        = {3},
   pages         = {30--35},
@@ -525,7 +529,7 @@
 @TechReport{Riksbank,
   author        = {{Sveriges Riksbank}},
   year          = {2020},
-  title         = {The {R}iksbank's e-krona project},
+  title         = {{The Riksbank's e-krona project}},
   month         = {February},
   institution   = {Sveriges Riksbank},
   url           = {\url{https://www.riksbank.se/globalassets/media/rapporter/e-krona/2019/the-riksbanks-e-krona-pilot.pdf}},
@@ -534,15 +538,15 @@
 @misc{Wojtczuk,
   author        = {Wojtczuk, Rafal and Joanna Rutkowska},
   year          = {2009},
-  title         = {Attacking {I}ntel Trusted Execution Technology},
+  title         = {{Attacking Intel Trusted Execution Technology}},
   howpublished  = {BlackHat-DC 2009},
 }
 
 @article{Yalta2010,
   author        = {Yalta, A. Talha and A. Yasemin Yalta},
   year          = {2010},
-  title         = {Should Economists Use Open Source Software for Doing Research?},
-  journal       = {\textit{Computational Economics}},
+  title         = {{Should Economists Use Open Source Software for Doing Research?}},
+  journal       = {Computational Economics},
   volume        = {35},
   pages         = {371--394},
 }
@@ -550,8 +554,8 @@
 @article{Yalta2008,
   author        = {Yalta, A. Talha and Riccardo Lucchetti},
   year          = {2008},
-  title         = {The {GNU/L}inux Platform and Freedom Respecting Software for Economists},
-  journal       = {\textit{Journal of Applied Econometrics}},
+  title         = {{The GNU/Linux Platform and Freedom Respecting Software for Economists}},
+  journal       = {Journal of Applied Econometrics},
   volume        = {23},
   pages         = {279-286},
 }
diff --git a/doc/cbdc-it/cbdc-it.tex b/doc/cbdc-it/cbdc-it.tex
index 454cf9237..10793e0ac 100644
--- a/doc/cbdc-it/cbdc-it.tex
+++ b/doc/cbdc-it/cbdc-it.tex
@@ -7,7 +7,6 @@
 \usepackage{graphicx}
 \usepackage{natbib}
 \usepackage[italian]{babel}
-%\usepackage{babelbib}
 \title{Come emettere una moneta digitale di banca centrale}
 \author{David Chaum\footnote{david@chaum.com} \\
   xx Network \and
@@ -20,7 +19,11 @@
       Prima versione:  maggio 2020}
 
 \addto\captionsitalian{\renewcommand{\figurename}{Diagramma}}
-\hyphenation{CBDC,Allen,Ni\-co\-las,Meikle\-john,Nie\-pelt}
+\AtBeginDocument{\renewcommand{\harvardand}{\&}}
+\hyphenation{CBDC}
+\hyphenation{Allen}
+\hyphenation{Meiklejohn}
+\hyphenation{Nicolas}
 
 \begin{document}
 
@@ -292,7 +295,7 @@ tassonomia delle \textit{stablecoin}, si veda~\cite{Bullmann}.}
 Le «\textit{stablecoin} algoritmiche» si basano su algoritmi per regolare
 l'offerta della moneta. In altre parole, cercano di stabilizzarne il
 prezzo attraverso una «politica monetaria algoritmica». Esistono
-esempi di tali \textit{stablecoin} (per es. Nubits), ma finora nessuna è
+esempi di tali \textit{stablecoin} (per esempio, Nubits), ma finora nessuna è
 riuscita a stabilizzare il proprio valore per molto tempo.
 
 Le \textit{stablecoin} «ancorate ad attivi» differiscono in base al tipo
@@ -303,7 +306,7 @@ l'oro), titoli e talvolta altre criptovalute. La capacità di un tale
 schema di stabilizzare il valore della moneta rispetto agli attivi
 sottostanti dipende in modo cruciale dai diritti legali acquisiti dai
 detentori della moneta. Se una \textit{stablecoin} è riscattabile ad un
-prezzo fisso (ad esempio, 1 moneta = 1 USD o 1 moneta = 1 oncia d'oro),
+prezzo fisso (ad esempio, \\ 1 moneta = 1 USD o 1 moneta = 1 oncia d'oro),
 la stabilità si può teoricamente ottenere.\footnote{Se possa stabilizzare
 il valore della \textit{stablecoin} anche rispetto ai beni e servizi
 scambiati dipende essenzialmente da quanto sia stabile il valore degli
@@ -348,7 +351,7 @@ controparte, ovvero al rischio di fallimento dell'emittente.
 
 Se una \textit{stablecoin} non è rimborsabile ad un prezzo fisso, la sua
 stabilità rispetto all'attivo sottostante non è garantita. Se la
-\textit{stablecoin} rappresenta comunque una quota di proprietà
+\textit{stablecoin} rappresenta \\ comunque una quota di proprietà
 dell'attivo sottostante, lo schema ricorda quello di un fondo comune di
 investimento chiuso o di un fondo indicizzato quotato (\textit{Exchange-Traded
 Fund} - ETF) e si applicano i relativi rischi. Il valore
@@ -370,7 +373,7 @@ centrale. Due modelli possibili che si trovano nella letteratura
 sull'argomento sono (a) CBDC basata su conti e (b) CBDC basata su
 token (o sul valore). Questi modelli corrispondono ai due tipi
 esistenti di moneta delle banche centrali e ai relativi sistemi di
-pagamento (Kahn e Roberds 2008): riserve delle banche centrali
+pagamento~\cite{Kahn2009}: riserve delle banche centrali
 (sistema basato su conti) e banconote (sistema basato su token). Un
 pagamento si verifica quando un'attivo monetario viene trasferito da un
 pagatore a un beneficiario. In un sistema basato su conti, il
@@ -458,7 +461,7 @@ sostengono che i trasferimenti di fondi dai depositi ai conti
 CBDC porterebbero alla sostituzione automatica del finanziamento
 mediante depositi con il finanziamento tramite la banca centrale, il
 che andrebbe ad esplicitare la garanzia finora implicita di prestatore
-di ultima istanza delle banche centrali. \cite{Berentsen}
+di ultima istanza delle banche centrali. \\ \cite{Berentsen}
 sostengono che la concorrenza delle banche centrali potrebbe persino
 avere un effetto disciplinare sulle banche commerciali e quindi
 aumentare la stabilità del sistema finanziario, dato che queste ultime
@@ -466,9 +469,9 @@ sarebbero costrette a consolidare la sicurezza dei propri modelli
 economici per eviatare corse agli sportelli.
 
 % References to Kumhof, Bindseil below should render like this:
-% valore (Kumhof &amp; Noone, 2018 e Bindseil, 2020).
+% valore (Kumhof &amp;amp; Noone, 2018 e Bindseil, 2020).
 % This was fixed by replacing "," with "and" to separate authors in the bib file.
-% It also fixed {Kumhof} to render as "Kumhof & Noone".
+% It also fixed {Kumhof} to render as "Kumhof &amp; Noone".
 
 Esistono anche proposte per ridurre il rischio di disintermediazione
 restringendo o scoraggiando l'uso della CBDC come riserva di valore. Una
@@ -492,7 +495,7 @@ problematiche.
 \label{cbdc-basata-su-token-e-legata-al-hardware}
 
 % References to Wojtczuk,Johnston,Lapid below do not render correctly in pdf. Should be:
-% compromesse (si veda, ad esempio, Wojtczuk &amp; Rutkowska 2009, Johnston 2010 e Lapid &amp; Wool 2018).
+% compromesse (si veda, ad esempio, Wojtczuk &amp;amp; Rutkowska 2009, Johnston 2010 e Lapid &amp;amp; Wool 2018).
 % but we can only either use "," or "e", but not switch AFAIK.
 % This was fixed by replacing "," with "and" to separate authors in the bib file.
 % It also fixed {Katzenbeisser} to render as  "Katzenbeisser et al."
@@ -521,7 +524,7 @@ finanziamento del terrorismo renderebbe difficile la lotta alla
 criminalità.
 
 % References to Soukup,Garcia,Kasper,CCC below do not render correctly in pdf. Should be:
-% L’esperienza (si veda, ad esempio, Soukup &amp; Muff 2007, Garcia et al. 2008, Kasper et al. 2010 e CCC e.V. 2017) suggerisce
+% L’esperienza (si veda, ad esempio, Soukup &amp;amp; Muff 2007, Garcia et al. 2008, Kasper et al. 2010 e CCC e.V. 2017) suggerisce
 % but we can only either use "," or "e", but not switch AFAIK.
 % This was fixed by replacing "," with "and" to separate authors in the bib file.
 
@@ -542,7 +545,7 @@ Tuttavia, il rilevamento delle frodi richiede la capacità di identificare
 i pagatori e tenere traccia dei clienti, il che non è compatibile con la
 privacy nelle transazioni.
 
-\section{Una CBDC basata su token progettata per tutelare la privacy}
+\section{Una CBDC basata su token progettata per \\ tutelare la privacy}
 \label{4.-una-cbdc-basata-su-token-progettata-per-tutelare-la-privacy}
 
 La CBDC qui proposta è di tipo «solo software», semplicemente
@@ -872,7 +875,7 @@ un uso futuro con il protocollo di scambio di chiavi
 Sia $C_{i}$ la chiave pubblica corrispondente a $c_{i}$.
 Il cliente chiede quindi alla banca centrale di creare una firma cieca su
 $C_{i}$ per $i \in \{ 1,\ldots,\kappa\}$.\footnote{Se dovesse essere
-utilizzato il crittosistema RSA per le firme cieche, useremmo
+utilizzato il crittosistema RSA per le firme cieche, useremmo \\
 $f \equiv \emph{FDH}_{n}(C_{i})$, dove
 $\emph{FDH}_{n}()$
 è l'hash del dominio completo sul dominio $n$.} In questa richiesta, il
@@ -1090,7 +1093,7 @@ principale è rappresentato dall'archiviazione sicura per
 molti anni di 1–10 kilobyte per transazione. Gli esperimenti su un
 prototipo di GNU Taler che utilizzava i prezzi di \textit{Amazon Web Service}
 hanno stabilito che il costo del sistema (archiviazione, larghezza di
-banda e capacità di calcolo) su larga scala sarebbe inferiore a
+banda e capacità di calcolo) su larga scala sarebbe inferiore a \\ 
 0,0001 USD per transazione~\cite[per i dettagli sui dati, si veda][]{Dold}.
 
 \section{Considerazioni normative e politiche}
@@ -1115,8 +1118,8 @@ contratti relativi ai pagamenti sospetti al fine di verificarne la
 legittimità. La trasparenza del reddito risultante è anche una forte
 misura contro l'evasione fiscale perché i venditori non possono
 sottodichiarare il proprio reddito o evadere le tasse sulle vendite.
-Nel complesso, il sistema implementa gli approcci \textit{privacy-by-
-design} e \textit{privacy-by-default} (come richiesto, ad esempio,
+Nel complesso, il sistema implementa gli approcci~\textit{privacy-by-design} 
+e \textit{privacy-by-default} (come richiesto, ad esempio,
 dal Regolamento generale sulla protezione dei dati dell'UE, GDPR). I
 venditori non apprendono necessariamente l'identità dei propri clienti,
 le banche possiedono solo le informazioni necessarie sulle attività dei
@@ -1151,7 +1154,7 @@ ci aspettiamo un accaparramento significativamente maggiore rispetto a
 quello del denaro fisico.
 
 Tuttavia, se l'accumulo o la massiccia conversione dei depositi
-bancari in CBDC dovessero destare proccupazione, la banca centrale
+bancari in CBDC dovessero destare preoccupazione, la banca centrale
 avrebbe diverse opzioni. Come si è spiegato, secondo il progetto
 proposto le banche centrali fissano una data di scadenza per tutte le
 chiavi di firma, il che implica che in una data prestabilita le monete
@@ -1217,7 +1220,7 @@ clienti che la trasparenza del reddito, fornendo al contempo un sistema
 di resto efficiente, scambi atomici~\cite[vedi][]{Camenisch2007} e la
 possibilità di ripristinare i portafogli dal backup.
 
-Per quanto riguarda i sistemi di pagamento per le CBDC, \cite{Danezis}
+Per quanto riguarda i sistemi di pagamento per le CBDC,~\cite{Danezis}
 hanno progettato un \textit{ledger} scalabile per RSCoin. Si tratta
 fondamentalmente di un sistema RTGS che viene protetto utilizzando la
 stessa crittografia che si usa in Bitcoin. Come Taler, il design utilizza
@@ -1295,7 +1298,6 @@ alla loro politica monetaria e alla stabilità finanziaria sfruttando al
 contempo i vantaggi del passaggio al digitale.
 
 \newpage
-\bibliographystyle{agsm}
+\bibliographystyle{agsm-mod}
 \bibliography{cbdc-it}
-
 \end{document}