summaryrefslogtreecommitdiff
path: root/macros/optex/base/bib-simple.opm
diff options
context:
space:
mode:
Diffstat (limited to 'macros/optex/base/bib-simple.opm')
-rw-r--r--macros/optex/base/bib-simple.opm49
1 files changed, 25 insertions, 24 deletions
diff --git a/macros/optex/base/bib-simple.opm b/macros/optex/base/bib-simple.opm
index fe1730ba67..3af9a1b927 100644
--- a/macros/optex/base/bib-simple.opm
+++ b/macros/optex/base/bib-simple.opm
@@ -1,6 +1,6 @@
%% This is part of the OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \_undefined {BIB style (simple) <2022-05-10>} % loaded on demand by \usebib
+\_codedecl \_undefined {BIB style (simple) <2022-10-10>} % loaded on demand by \usebib
\_ifx\_optexbibstyle\_undefined \_errmessage
{This file can be read by: \_string\usebib/? (simple) bibfiles command only}
@@ -36,6 +36,7 @@
}
\_def\_preurl{\_hfil\_break}
+\_def\_Inclause{In:~}
% Non-standard fieldnames:
@@ -56,9 +57,9 @@
\_setbibmark
}
\_sdef{_print:book}{%
- \_bprinta [!author] {*\:\ }{\_bibwarning}%
- \_bprintb [title] {{\_em##1}.\ }{\_bibwarning}%
- \_bprinta [edition] {*~\_mtext{bib.edition}.\ }{}%
+ \_bprinta [!author] {*.\ }{\_bibwarning}%
+ \_bprintb [title] {{\_em##1}\:\ }{\_bibwarning}%
+ \_bprinta [edition] {*\_mtext{bib.edition}\ }{}%
\_bprinta [address] {*: }{\_bibwarning}%
\_bprinta [publisher] {*, }{\_bibwarning}%
\_bprinta [year] {*.\ }{\_bibwarning}%
@@ -66,21 +67,21 @@
\_bprintb [url] {\_preurl\_url{##1}. }{}%
}
\_sdef{_print:article}{%
- \_bprinta [!author] {*\:\ }{\_bibwarning}%
- \_bprinta [title] {*.\ }{\_bibwarning}%
- \_bprintb [journal] {{\_em##1}.\ }{\_bibwarning}%
- \_bprinta [year] {*, }{}%
+ \_bprinta [!author] {*.\ }{\_bibwarning}%
+ \_bprinta [title] {*\:\ }{\_bibwarning}%
+ \_bprintb [journal] {{\_em##1}\:\ }{\_bibwarning}%
+ \_bprinta [year] {*\_bprintv[volume,number,pages]{,}{.} }{}%
\_bprinta [volume] {* }{}%
- \_bprinta [number] {(*), }{}%
+ \_bprinta [number] {(*)\_bprintv[pages]{,}{.} }{}%
\_bprinta [pages] {*.\ }{}%
\_bprintb [doi] {DOI~\_ulink[http://dx.doi.org/##1]{##1}.\ }{}%
}
\_sdef{_print:inbook}{%
- \_bprinta [!author] {*\:\ }{\_bibwarning}%
- \_bprintb [title] {{\_em##1.}\ }{\_bibwarning}%
- In:~%
+ \_bprinta [!author] {*.\ }{\_bibwarning}%
+ \_bprintb [title] {{\_em##1}\:\ }{\_bibwarning}%
+ \_Inclause
\_bprinta [!editor] {*,~eds.\ }{}%
- \_bprintb [booktitle] {{\_em##1}.\ }{\_bibwarning}%
+ \_bprintb [booktitle] {{\_em##1}\:\ }{\_bibwarning}%
\_bprinta [address] {*: }{\_bibwarning}%
\_bprinta [publisher] {*, }{\_bibwarning}%
\_bprinta [year] {*.\ }{\_bibwarning}%
@@ -92,12 +93,12 @@
\_slet{_print:inproceedings}{_print:inbook}
\_sdef{_print:incolection}{%
- \_bprinta [!author] {*\:\ }{\_bibwarning}%
- \_bprintb [title] {{\_em##1}.\ }{\_bibwarning}%
+ \_bprinta [!author] {*.\ }{\_bibwarning}%
+ \_bprintb [title] {{\_em##1}\:\ }{\_bibwarning}%
\_bprinta [crossreff] {In~\_cite[*]. }{%
\_bprinta [booktitle] {*. }{\_bibwarning}%
\_bprinta [!editor] {*,~eds.\ }{\_bibwarning}%
- \_bprinta [edition] {*~\_mtext{bib.edition}.\ }{\_bibwarning}%
+ \_bprinta [edition] {*\_mtext{bib.edition}\ }{\_bibwarning}%
\_bprinta [address] {*: }{\_bibwarning}%
\_bprinta [publisher] {*, }{\_bibwarning}%
\_bprinta [year] {*.\ }{\_bibwarning}%
@@ -105,9 +106,9 @@
\_bprintb [url] {\_preurl\_url{####1}. }{}}%
}
\_sdef{_print:conference}{%
- \_bprinta [!author] {*\:\ }{\_bibwarning}%
+ \_bprinta [!author] {*.\ }{\_bibwarning}%
\_bprintb [title] {{\_em##1}\:\ }{\_bibwarning}%
- \_bprinta [edition] {*~\_mtext{bib.edition}.\ }{}%
+ \_bprinta [edition] {*\_mtext{bib.edition}\ }{}%
\_bprinta [address] {*: }{\_bibwarning}%
\_bprinta [publisher] {*, }{\_bibwarning}%
\_bprinta [year] {*.\ }{\_bibwarning}%
@@ -115,7 +116,7 @@
\_bprintb [url] {\_preurl\_url{##1}. }{}%
}
\_sdef{_print:thesis}{%
- \_bprinta [!author] {*\:\ }{\_bibwarning}%
+ \_bprinta [!author] {*.\ }{\_bibwarning}%
\_bprintb [title] {{\_em##1}\:\ }{\_bibwarning}%
\_bprinta [type] {*,\ }{\_bibwarning}%
\_bprinta [school] {*.\ }{}%
@@ -124,31 +125,31 @@
\_bprintb [url] {\_preurl\_url{##1}. }{}%
}
\_sdef{_print:proceedings}{%
- \_bprinta [!author] {*\:\ }{\_bibwarning}%
+ \_bprinta [!author] {*.\ }{\_bibwarning}%
\_bprintb [title] {{\_em##1}\:\ }{\_bibwarning}%
\_bprinta [publisher] {*.\ }{%
\_bprinta [organization] {*.\ }{\_bibwarning}}%
}
\_sdef{_print:techreport}{%
- \_bprinta [!author] {*\:\ }{\_bibwarning}%
+ \_bprinta [!author] {*.\ }{\_bibwarning}%
\_bprintb [title] {{\_em##1}\:\ }{\_bibwarning}%
\_mtext{bib.techreport}.
\_bprinta [institution] {*.\ }{}%
}
\_sdef{_print:booklet}{%
- \_bprinta [!author] {*\:\ }{\_bibwarning}%
+ \_bprinta [!author] {*.\ }{\_bibwarning}%
\_bprintb [title] {{\_em##1}\:\ }{\_bibwarning}%
\_bprinta [howpublished] {*.\ }{\_bibwarning}%
}
\_sdef{_print:manual}{%
- \_bprinta [!author] {*\:\ }{}%
+ \_bprinta [!author] {*.\ }{}%
\_bprintb [title] {{\_em##1}\:\ }{\_bibwarning}%
\_bprinta [year] {*.\ }{}%
\_bprinta [institution] {*.\ }{}%
\_bprintb [url] {\_preurl\_url{##1}. }{}%
}
\_sdef{_print:misc}{%
- \_bprinta [!author] {*\:\ }{}%
+ \_bprinta [!author] {*.\ }{}%
\_bprintb [title] {{\_em##1}\:\ }{}%
\_bprinta [howpublished] {*.\ }{}%
\_bprinta [institution] {*.\ }{}%