summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/geschichtsfrkl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-04-09 16:30:14 +0000
committerKarl Berry <karl@freefriends.org>2012-04-09 16:30:14 +0000
commit5518dc9a8bc9b6fb6fbf6253b03d08d5c2580c06 (patch)
treee748eb3dba44665facc0dcb56fae6abecb526aa0 /Master/texmf-dist/tex/latex/geschichtsfrkl
parent3b27b81d914d73f41fb53f7ea8fc4af31eacceb7 (diff)
geschichtsfrkl (8apr12)
git-svn-id: svn://tug.org/texlive/trunk@25886 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/geschichtsfrkl')
-rw-r--r--Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.bbx24
-rw-r--r--Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.cbx17
2 files changed, 30 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.bbx b/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.bbx
index 2ce5084a287..83cbe07c014 100644
--- a/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.bbx
+++ b/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.bbx
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{geschichtsfrkl.bbx}%
- [2012/03/29 v1.0 geschichtsfrkl -- %
+ [2012/03/31 v1.1 geschichtsfrkl -- %
biblatex für Historiker, bbx-Datei]
\RequireBibliographyStyle{standard}
\AtBeginDocument{\typeout{}\typeout%
@@ -49,13 +49,16 @@
\DeclareEntryOption{antik}[true]{\csuse{bool#1}{cbx:antik}}%
\newbool{bbx:diss}%
\DeclareEntryOption{diss}[true]{\csuse{bool#1}{bbx:diss}}%
-\newbool{cbx:frg}
+\newbool{cbx:frg}%
\DeclareEntryOption{frg}[true]{\csuse{bool#1}{cbx:frg}}%
-\newbool{cbx:frgantik}
+\newbool{cbx:frgantik}%
\DeclareEntryOption{frgantik}[true]{\csuse{bool#1}{cbx:frgantik}%
\csuse{bool#1}{cbx:frg}}%
\newbool{cbx:urkunde}%
\DeclareEntryOption{urkunde}[true]{\csuse{bool#1}{cbx:urkunde}}%
+\newbool{cbx:nurshorthand}%
+\DeclareEntryOption{nurshorthand}[true]{\csuse{bool#1}%
+ {cbx:nurshorthand}}%
\newbibmacro{savestuff}{%
\savename{editor}{\bbx@lasteditor}%
\savefield{namehash}{\bbx@lasthash}%
@@ -227,10 +230,12 @@
\newbibmacro*{signatur}{%
\iffieldundef{note}{}{\printtext[parens]{\printfield{note}}\nopunct}%
}%
-\newbibmacro*{booktitle+editor}{%
+\newbibmacro*{booktitle+volume+editor}{%
\ifnameundef{editor}{
\usebibmacro{maintitle}%
- \newunit%
+ \newunit
+ \iffieldundef{volume}{}%
+ {\bibstring{volume}\addspace\printfield{volume}\newunit}%
}{%
\ifbool{bbx:hrsg}{%
\ifboolexpr{bool {bbx:editorders} and%
@@ -240,9 +245,13 @@
{\printnames[hrsg]{editor}\addspace}%
\printtext[parens]{\bibstring{editor}}\addcolon\addspace%
\usebibmacro{maintitle}%
+ \iffieldundef{volume}{}%
+ {\newunit\bibstring{volume}\addspace\printfield{volume}}%
\newunit%
}{%
\usebibmacro{maintitle}%
+ \iffieldundef{volume}{}%
+ {\newunit\bibstring{volume}\addspace\printfield{volume}}%
\newunit%
\printtext{hrsg\adddot\addspace v\adddot}%
\setunit{\addspace}%
@@ -330,11 +339,12 @@
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author}%
- \setunit{\addcolon\addspace}\newblock%
+ \ifnameundef{author}{}%
+ {\setunit*{\addcolon\addspace}\newblock}%
\usebibmacro{title}%
\newunit\newblock
\usebibmacro{in:}%
- \usebibmacro{booktitle+editor}%
+ \usebibmacro{booktitle+volume+editor}%
\setunit{\addspace}%
\ifbool{bbx:jahrreihe}{}%
{\usebibmacro{series+number}}%
diff --git a/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.cbx b/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.cbx
index eef69e0c9e6..035c68a2b51 100644
--- a/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.cbx
+++ b/Master/texmf-dist/tex/latex/geschichtsfrkl/geschichtsfrkl.cbx
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{geschichtsfrkl.cbx}%
- [2012/03/29 v1.0 geschichtsfrkl -- %
+ [2012/03/31 v1.1 geschichtsfrkl -- %
biblatex für Historiker, cbx-Datei]%
\ExecuteBibliographyOptions{%
citetracker=true,%
@@ -38,6 +38,7 @@
\newbool{cbx:fnverweise}%
\newbool{cbx:jahrkeineklammern}%
\newbool{cbx:neueseitevollzitat}%
+\newbool{cbx:antikebd}%
\DeclareBibliographyOption{mitjahr}[true]{\csuse{bool#1}%
{cbx:mitjahr}}%
\DeclareBibliographyOption{mitvn}[true]{\csuse{bool#1}%
@@ -52,6 +53,8 @@
{cbx:jahrkeineklammern}}%
\DeclareBibliographyOption{neueseitevollzitat}[true]{\csuse{bool#1}%
{cbx:neueseitevollzitat}}%
+\DeclareBibliographyOption{antikebd}[true]{\csuse{bool#1}%
+ {cbx:antikebd}}%
\newbool{cbx:nurinit}%
\DeclareBibliographyOption{citeinit}[true]{\csuse{bool#1}%
{cbx:nurinit}}%
@@ -146,21 +149,27 @@
\ifboolexpr{test \ifciteibid and%
not (bool {cbx:neueseitevollzitat} and test {\iffirstonpage})}%
{\bibstring{ibidem}\isdot}%
- {\ifboolexpr{test \ifciteidem and not%
+ {\ifbool{cbx:nurshorthand}%
+ {\printfield{shorthand}}%
+ {\ifboolexpr{test \ifciteidem and not%
(bool {cbx:neueseitevollzitat} and test {\iffirstonpage})}%
{\bibnamedash}%
{\usebibmacro{cite:name}}%
\setunit{\addcolon\addspace}%
\usebibmacro{cite:title}%
\ifbool{cbx:mitjahr}{\setunit{\addspace}%
- \usebibmacro{cite:year}}{}%
+ \usebibmacro{cite:year}}{}}%
\usebibmacro{fnverweis}}%
}%
\newbibmacro*{cite}{%
\ifboolexpr{bool {cbx:antik} or bool {cbx:frg}}{%
\ifboolexpr{bool{cbx:antik} or bool {cbx:frgantik}}{%
\bibhyperref{%
- \printfield{shorthand}\setunit{\adddot\addspace}%
+ \ifboolexpr{bool {cbx:antikebd} and
+ test \ifciteibid and not%
+ (bool {cbx:neueseitevollzitat} and test {\iffirstonpage})}%
+ {\bibstring{ibidem}}%
+ {\printfield{shorthand}\setunit{\adddot\addspace}}%
}%
}{%
\bibhyperref{%