From 524625c68b34cf1727e5cd9d9493ff1b0523966c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 11 Jan 2022 21:59:48 +0000 Subject: bibarts (11jan22) git-svn-id: svn://tug.org/texlive/trunk@61569 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/bibarts/README.txt | 30 ++++-- Master/texmf-dist/doc/latex/bibarts/ba-short.pdf | Bin 332637 -> 332462 bytes Master/texmf-dist/doc/latex/bibarts/ba-short.tex | 44 ++++----- Master/texmf-dist/doc/latex/bibarts/bibarts.pdf | Bin 1044317 -> 1044258 bytes Master/texmf-dist/doc/latex/bibarts/bibarts.tex | 98 ++++++++++++------ Master/texmf-dist/doc/latex/bibarts/bibsort.exe | Bin 229888 -> 229888 bytes Master/texmf-dist/source/latex/bibarts/bibsort.c | 120 +++++++++++++++++++---- Master/texmf-dist/tex/latex/bibarts/bibarts.sty | 14 +-- 8 files changed, 221 insertions(+), 85 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/bibarts/README.txt b/Master/texmf-dist/doc/latex/bibarts/README.txt index 2e068aa0174..8fbb2c100f5 100644 --- a/Master/texmf-dist/doc/latex/bibarts/README.txt +++ b/Master/texmf-dist/doc/latex/bibarts/README.txt @@ -7,7 +7,7 @@ it requires a program, for which source and Windows executable are provided. === -BibArts 2.3 is a LaTeX package to assist in making bibliographical features +BibArts 2.4 is a LaTeX package to assist in making bibliographical features common in the arts and humanities (history, political science, etc.). bibarts.sty provides commands for quotation, register keywords, abbreviations, and especially for a formatted citation of literature, @@ -22,11 +22,11 @@ with BibTeX, and it does not use any data bank except your own LaTeX text. The lists are created by bibsort. A file bibsort.exe is part of the package ( CTAN mirrors > BibArts > bibarts.zip ) and runs on newer Windows systems. Other users first have to create a binary file from bibsort.c (ANSI-C) with -their own C-compiler. BibArts 2.3 is developed and tested on Windows 10 +their own C-compiler. BibArts 2.4 is developed and tested on Windows 10 with the 2021-11-22 LaTeX 2e distribution, but it should be able to work even with LaTeX 2.09. - BibArts 2.3 (9 files, 8 dated 2021-12-06): + BibArts 2.4 (9 files, 8 dated 2022-01-10): README.txt This file here bibarts.sty The LaTeX style file ba-short.pdf Short introduction (English) @@ -64,7 +64,7 @@ see examples for the new commands \frompagesep and \ntsep in bibarts.pdf. Changes from BibArts version 2.0 (2015) to version 2.1 (2016): -BibArts 2.0 set \footnotesep to 2ex, whereas 2.1 to 2.3 do *not* change the +BibArts 2.0 set \footnotesep to 2ex, whereas 2.1 to 2.4 do *not* change the pre-set value. If you want to continue with the 2.0-distance between two footnotes, you will have to type \setlength{\footnotesep}{2ex} in your text. @@ -160,14 +160,14 @@ in the keyword. The active " and \= \. \b \d are not represented any more. === -Changes from BibArts version 2.2 (2019) to version 2.3 (now, 2021): +Changes from BibArts version 2.2 (2019) to version 2.3 (2021): -bibsort 2.3, the sorting program of the package, has two new options: +There have been two new options for bibsort: -utf8 sorts UTF8 characters as definded in utf8enc.dfu 2021/01/27 v1.2l, except \cyr...- and \CYR...-commands, which bibsort still ignores. - bibsort 2.3 is able to sort the accent \textcommabelow (parallel to + bibsort is able to sort the accent \textcommabelow (parallel to U+0218 to U+021B). The internal representation of accents did change (two instead of one ASCII 1 to 31). For numerous smaller changes see /* 2.3 comments */ in bibsort.c. @@ -189,8 +189,22 @@ bibsort 2.3, the sorting program of the package, has two new options: Smith John Young Peter +=== + +Changes from BibArts version 2.3 (2021) to version 2.4 (now, 2022): + +An error was fixed concerning "inner v-commands" on the List of Literature, +and the List of Published Documents: In shortened "inner" references, +BibArts 2.3 -- together with bibsort -e ... -- printed the first names of +co-authors. Now, such shortened references only print the family names. + +bibsort now knows ten new utf8-characters (parallel to the changes in +utf8enc.dfu from version 2021/01/27 v1.2l to 2021/06/21 v1.2n). + + === Published under the terms of the GNU General Public License. -BibArts 2.3 (2021) - (C) Timo Baumann, Versions 2.x (2021, 2019, 2016, 2015) +BibArts 2.4 (2022): +(C) Timo Baumann, Versions 2.x (2022, 2021, 2019, 2016, 2015) diff --git a/Master/texmf-dist/doc/latex/bibarts/ba-short.pdf b/Master/texmf-dist/doc/latex/bibarts/ba-short.pdf index 628c77026cb..8ab54f3f615 100644 Binary files a/Master/texmf-dist/doc/latex/bibarts/ba-short.pdf and b/Master/texmf-dist/doc/latex/bibarts/ba-short.pdf differ diff --git a/Master/texmf-dist/doc/latex/bibarts/ba-short.tex b/Master/texmf-dist/doc/latex/bibarts/ba-short.tex index 38fe449fdc4..642978d4173 100644 --- a/Master/texmf-dist/doc/latex/bibarts/ba-short.tex +++ b/Master/texmf-dist/doc/latex/bibarts/ba-short.tex @@ -1,5 +1,5 @@ -%% BibArts 2.3 assists you to write LaTeX texts in arts and humanities. -%% Copyright (C) 2021 Timo Baumann bibarts[at]gmx.de (2021/12/06) +%% BibArts 2.4 assists you to write LaTeX texts in arts and humanities. +%% Copyright (C) 2022 Timo Baumann bibarts[at]gmx.de (2022/01/10) %%% LaTeX + "bibsort -i ba-short -m -utf8 -k -e -h" + LaTeX %%% @@ -16,7 +16,7 @@ \title{The \LaTeX\hy Package \BibArts \\[1.25ex] {\normalsize\slshape A package to assist in making bibliographical features \\[-1.25ex] common in the arts and humanities}} \author{\textsc{Timo Baumann}} - \date{\small Version 2.3 (2021). \hspace{1em}\copyright\ 2.x (2021, 2019, 2016, 2015).} + \date{\small Version 2.4 (2022). \hspace{1em}\copyright\ 2.x (2022, 2021, 2019, 2016, 2015).} \setcounter{secnumdepth}{0} %\renewcommand{\kxxemph}{\em} @@ -60,7 +60,7 @@ \vspace{1.75ex} \hbox{\parbox{7.7cm}{\footnotesize\noindent -\textbf{\BibArts~2.3 (9 files, 8 dated 2021\ko/12\ko/06):} \\[.875ex] +\textbf{\BibArts~2.4 (9 files, 8 dated 2022\ko/01\ko/10):} \\[.875ex] \begin{tabular}{ll}% \texttt{README.txt} & Version history since 1.3 \\[-1.75pt] \texttt{bibarts.sty} & The \LaTeX\ style file \\[-1.75pt] @@ -196,7 +196,7 @@ In footnotes, and \texttt{minipage} footnotes, \BibArts\ is introducing \setcounter{footnote}{0} {\footnotesize\begin{verbatim} - <1> ...\footnote{ \vli{Niklas} {Luhmann} {\ktit{Soziale Systeme}. + <1> ...\footnote{ \vli{Niklas} {Luhmann} {\ktit{Soziale Systeme}. Grundriß einer allgemeinen Theorie, Frankfurt/M. 1984}.} <2> ...\footnote{\kli{Luhmann}{Soziale Systeme}|1|[22], and @@ -204,7 +204,7 @@ In footnotes, and \texttt{minipage} footnotes, \BibArts\ is introducing <3> ...\footnote{\kli{Luhmann}{Soziale Systeme}|1|[23]. Next sentence.} <4> \footnote{\kli{Luhmann}{Soziale Systeme}|2|[56].} - <5> ...\footnote{\arq{Haber to Kultusminister, 17 December 1914} + <5> ...\footnote{\arq{Haber to Kultusminister, 17 December 1914} {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, Litt~A, Nr.\,108}|2|(223\f).} @@ -225,20 +225,20 @@ In footnotes, and \texttt{minipage} footnotes, \BibArts\ is introducing \end{verbatim}} \noindent - When you introduce a book,\footnote{ \vli{Niklas}{Luhmann}{\ktit{Soziale Systeme}. + When you introduce a book,\footnote{ \vli{Niklas} {Luhmann} {\ktit{Soziale Systeme}. Grundriß einer allgemeinen Theorie, Frankfurt/M. 1984}.} you are free to add a \verb+|Vol|+, or not. But if you set a \verb+|Vol|+ once, you will have to repeat that, when you refer to the same book in the following footnote (or say \verb|\clearbamem|). \verb+[Pg]+ is equivalent. You may also cite one work several times in the same - footnote.\footnote{\kli{Luhmann}{Soziale - Systeme}|1|[22], and \kli{Luhmann}{Soziale Systeme}|1|[23].}\,% + footnote.\footnote{\kli{Luhmann}{Soziale Systeme}|1|[22], and + \kli{Luhmann}{Soziale Systeme}|1|[23].}\,% \footnote{\kli{Luhmann}{Soziale Systeme}|1|[23]. Next sentence.}\,% \footnote{\kli{Luhmann}{Soziale Systeme}|2|[56].} \vspace{1ex}\noindent - And here are examples about how to cite archive sources.\footnote{\arq{Haber to - Kultusminister, 17 December 1914} + And here are examples about how to cite archive + sources.\footnote{\arq{Haber to Kultusminister, 17 December 1914} {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, Litt~A, Nr.\,108}|2|(223\f).}\,% \footnote{\arq{Setsuro Tamaru to Clara Haber, 24 December 1914} {GStAPK, HA\,1, Rep~76~Vc, Sekt~1, Tit~23, @@ -273,8 +273,8 @@ In footnotes, and \texttt{minipage} footnotes, \BibArts\ is introducing \\ \ \ \ \ Frankfurt/M. 1984\b{\}}[22].\} \\[1.5ex] ... pp.\bs footnote\{ \bs notibidemize \\ \ \ \ \%no ibidem in this footnote\% - \\ \ \ Shortened ref.: \bs kli\{Luhmann\} - \\ \ \ \ \ \ \ \{Soziale Systeme\}[23 \bs f].\} + \\ \ Shortened ref.: \bs kli\{Luhmann\} + \\ \ \ \ \ \ \ \{Soziale Systeme\}[23\bs f].\} } {\conferize ...\footnote{ Full ref.: \vli{Niklas}{Luhmann} {\ktit{Soziale Systeme}. @@ -282,7 +282,7 @@ In footnotes, and \texttt{minipage} footnotes, \BibArts\ is introducing \texttt{[u, v]} or \texttt{[w-x]} or \texttt{[y\bs f]} or \texttt{[z\bs baplural]} are creating pp.\footnote{\notibidemize %no ibidem in this footnote% - Shortened ref.: \kli{Luhmann} {Soziale Systeme}[23 \f].} + Shortened ref.: \kli{Luhmann} {Soziale Systeme}[23\f].} } \noindent @@ -298,7 +298,7 @@ In footnotes, and \texttt{minipage} footnotes, \BibArts\ is introducing \section{The extra \texttt{*}\{\ko\textit{argument}\} of \texttt{v}- and \texttt{k}\fhy commands} -\textit{Works by multiple authors} use \texttt{x}\fhy commands with co\hy authors in \texttt{*}\hy arguments: +\textit{Works by multiple authors}: Use \texttt{x}\fhy commands with co\hy authors in \texttt{*}\hy arguments: \Doppelbox { @@ -478,8 +478,8 @@ is not wanted, use \verb|\ntvauthor| instead of the inner \verb|\vli|: { \vspace{.225ex} \bs footnote\{\bs vli\{Jost\}\{Dülffer\} - \\[.35ex] \ \b{\{}\bs em \bs ktit\{Einleitung\}\bs em, in: - \\[.35ex] \ \ \bs ntvauthor\{Jost\}\{Dülffer\} + \\[.35ex] \ \b{\{}\bs em \bs ktit\{Einleitung\}\bs em, + \\[.35ex] \ \ in: \bs ntvauthor\{Jost\}\{Dülffer\} \\[.35ex] \ \ Bereit zum Krieg\b{\}}[9].\} \\[2.25ex] \bs footnote\{\bs kli\{Dülffer\} @@ -488,8 +488,8 @@ is not wanted, use \verb|\ntvauthor| instead of the inner \verb|\vli|: { \texttt{\bs emph\{\bs ktit\{}\fabra{...}\texttt{\}\}} masks {\scriptsize cited as \fabra{...}},\vspace{-.1ex} so use \texttt{\bs em} \abra{...}\,\texttt{\bs em} to emphasize!\footnote{\vli{Jost}{Dülffer} - {\em \ktit{Einleitung}\em, in: - \ntvauthor{Jost}{Dülffer} Bereit zum Krieg}[9].} + {\em \ktit{Einleitung}\em, + in: \ntvauthor{Jost}{Dülffer} Bereit zum Krieg}[9].} \footnote{\kli{Dülffer} {Einleitung}[9].} } @@ -516,12 +516,12 @@ Here, \fbox{iT} is a centrally defined inner\,k\kern -0.05em Title: \newpage\noindent In the case of multiple works by one author, -you may enter \hspace{.25em} \texttt{bibsort -k }...\ \hspace{.005em} at the prompt. +you may enter \hspace{.25em} \texttt{bibsort -k }\abra{...}\ \hspace{.005em} at the prompt. Then, in both \texttt{v}\fhy lists, \BibArts\ inserts \hspace{.05em} $\sim$ \hspace{.005em} instead of the repeated \textit{first name and last name}. And \texttt{-e} prints the last names of co\hy authors first. Anyway, -\label{appendix} \hspace{.25em}\verb|\printbibtitle| \verb|\printvli| \verb|\printvqu| -\hspace{.3em}insert your bibliography: +\label{appendix} \hspace{-.05em}\verb|\printbibtitle|\hspace{.05em}\verb|\printvli|\hspace{.05em}\verb|\printvqu| +will print your bibliography: \printbibtitle \printvli \printvqu diff --git a/Master/texmf-dist/doc/latex/bibarts/bibarts.pdf b/Master/texmf-dist/doc/latex/bibarts/bibarts.pdf index 92a21033afe..a8d267ff8f6 100644 Binary files a/Master/texmf-dist/doc/latex/bibarts/bibarts.pdf and b/Master/texmf-dist/doc/latex/bibarts/bibarts.pdf differ diff --git a/Master/texmf-dist/doc/latex/bibarts/bibarts.tex b/Master/texmf-dist/doc/latex/bibarts/bibarts.tex index 37183b132be..deed6c30d76 100644 --- a/Master/texmf-dist/doc/latex/bibarts/bibarts.tex +++ b/Master/texmf-dist/doc/latex/bibarts/bibarts.tex @@ -1,5 +1,5 @@ -%% BibArts 2.3 assists you to write LaTeX texts in arts and humanities. -%% Copyright (C) 2021 Timo Baumann bibarts[at]gmx.de (2021/12/06) +%% BibArts 2.4 assists you to write LaTeX texts in arts and humanities. +%% Copyright (C) 2022 Timo Baumann bibarts[at]gmx.de (2022/01/10) %%% LaTeX + "bibsort -i bibarts -m -utf8 -k -e -g1 -h" + LaTeX %%% @@ -21,7 +21,7 @@ \setlength{\footnotesep}{2ex} %% ... wie in bibarts.sty 2.0; siehe README.txt. %% - \usepackage[utf8]{inputenc} %% bibarts.tex, Vers. 2.3, enthaelt utf8-Zeichen. %% + \usepackage[utf8]{inputenc} %% bibarts.tex, Vers. 2.4, enthaelt utf8-Zeichen. %% \usepackage[T1]{fontenc} %% Automatische Trennung von Worten mit Umlauten. %% @@ -34,7 +34,7 @@ %\allprrtrue %% <= Prozent am Zeilenanfang auf Wunsch entfernen; -%% mit \allprrtrue kommen ALLE utf8-Zeichen, die bibsort 2.3 kennt, +%% mit \allprrtrue kommen ALLE utf8-Zeichen, die bibsort 2.4 kennt, %% in "Das Personenregister als Beispiel f"ur das Sortieren" (Kap. 18). @@ -44,7 +44,7 @@ \author{\scshape{Timo Baumann}} - \date{\small Version 2.3 (2021). \hspace{.5em}\copyright\ 2.x (2021, 2019, 2016, 2015). + \date{\small Version 2.4 (2022). \hspace{.5em}\copyright\ 2.x (2022, 2021, 2019, 2016, 2015). \hspace{.5em}\textbf{Inhalt S.\,\pageref{SectIn}}.} @@ -177,7 +177,7 @@ nichts mit \textsc{Bib}\TeX\ zu tun:\pdfko{.25} \hspace{.2em}bewirkt, dass \textit{ein} Autor (Vor- und Nachname gleich), der mit mehreren Werken zitiert wird, ab seiner zweiten Nennung auf der Literaturliste als $\sim$ erscheint. \verb|-utf8| \hspace{.2em}sortiert - UTF8\hy Zeichen analog zu \verb|utf8enc.dfu| 2021/01/27 v1.2l + UTF8\hy Zeichen analog zu \verb|utf8enc.dfu| 2021/06/21 v1.2n (\kern-.05em\textit{ohne} \verb|\cyr|...\ und \verb|\CYR|...\hy Zeichen). \vspace{1ex}\noindent @@ -610,7 +610,7 @@ auf der \hspace{-.25em}\verb|.vkc|\hy Liste nur ein Eintrag erscheint. Beides scheitert, falls Sie \hspace{-.125em}\verb|\underline| \label{underline} im v\fhy Befehl mit \verb|\protect| sch"utzen \baref{zrbr} und in k\fhy Befehlen nicht immer (Stand 2021). -%% Gilt 2021 noch, obwohl \underline nicht mehr wiklich zerbricht, aber nach +%% Gilt noch, obwohl \underline nicht mehr wiklich zerbricht, aber nach %% \underline und \protect\underline verschieden viele Leerzeichen stehen. @@ -1938,7 +1938,7 @@ defaultm"a\hyss ig \verb|\bfseries| ausf"uhrt (\textbf{fett}). Die Seiten, von denen Definitionen herstammen, sind in der Auf"|listung von Seitenzahlen nicht hervorgehoben. Eine Hervorhebung einzelner Seitenzahlen sieht -auch \BibArts\ 2.3 nie vor. +auch \BibArts\ 2.4 nie vor. F"ur Abk"urzungen wie \printonlyabk{u.\,a.}, die Allgemeingut sind und deshalb vielleicht nicht ins Abk"urzungsverzeichnis sollen, kann @@ -5339,8 +5339,8 @@ Nur \verb|bibsort| in der Eingabeauf"|forderung getippt druckt auf den Bildschir \catcode\grave@ba\|=\active\makeatother \def|{\hspace{-.25em}\hbox to 1em{\hfill$\sim$\hfill}\hspace{-.25em}}% \begin{verbatim} - %%> This is bibsort 2.3 (for help: bibsort -?) - %% bibsort 2.3 is part of BibArts 2.3 (C) Timo Baumann 2021. + %%> This is bibsort 2.4 (for help: bibsort -?) + %% bibsort 2.4 is part of BibArts 2.4 (C) Timo Baumann 2022. %% I read a LaTeX .aux file (follow \@input), and I write my output in files %% .vli Literature .vqu Published sources .grr Geographic index %% .vkc Short titles .arq Unpublished sources .prr Person index @@ -5411,30 +5411,41 @@ irref"uhrend, es sei ein\hspace{.2em} \texttt{Incomplete} \texttt{\bs ifx}~...\h \vspace{.75ex} Weitere Optionen wie \verb|-l|\,, \verb|-i=j| und \verb|-p| werden unten ab Seite~\pageref{plit} erkl"art. -\vspace{1.25ex}\noindent -Die Version 2.3 stellt f"ur \verb|bibsort| neu die Optionen \verb|-utf8| und \verb|-e| bereit: +\vspace{1.5ex}\noindent +Seit Version 2.3 stellt \verb|bibsort| die Optionen \verb|-utf8| und \verb|-e| bereit: \vspace{.75ex} -\verb|-utf8| \hspace{.1em}sorgt daf"ur, dass UTF8\hy Zeichen analog zu \verb|utf8enc.dfu| in Version v1.2l -vom 2021/01/27 (\kern-.05em\textit{ohne} \verb|\cyr|...\ und \verb|\CYR|...\hy Zeichen) sortiert werden. Probleme mit UTF8\hy Zeichen -berichtet \verb|bibsort| am Ende gesammelt. Falls Sie UTF8\hy Zeichen verwenden, aber \verb|-utf8| \hspace{.05em}nicht gesetzt -haben, meldet \verb|bibsort| nur das insgesamt letzte Oktett, das nicht behandelt wurde, also etwa:\footnote{Da UTF8\hy Zeichen jenseits Nr.\,127 +\verb|-utf8| \hspace{.1em}bewirkt, dass UTF8\hy Zeichen analog zu \verb|utf8enc.dfu| (v1.2n vom 2021/06/21 +\kern-.05em\textit{ohne} \verb|\cyr|...\ und \verb|\CYR|...\hy Zeichen) sortiert werden. Seit 2.4 sind nun zus"atzlich +ḟ \texttt{U+1E1F}, +Ḟ \texttt{U+1E1E}, +ḱ \texttt{U+1E31}, +Ḱ \texttt{U+1E30}, +Ẏ \texttt{U+1E8E}, +ẏ \texttt{U+1E8F}, +ẑ \texttt{U+1E91}, +Ẑ \texttt{U+1E90}, +ỳ \texttt{U+1EF3} und +Ỳ \texttt{U+1EF2} +bekannt (neu gegen"uber v1.2l). + +Falls Sie UTF8\hy Zeichen verwenden, aber \verb|-utf8| \hspace{.05em}nicht gesetzt +haben, meldet \verb|bibsort| nur das letzte unbekannte Oktett aus Ihrem Text, also etwa:\footnote{Da UTF8\hy Zeichen jenseits Nr.\,127 aus mehreren Oktetten bestehen, ist die im Beispiel angegebene Nummer \texttt{165} kein eindeutiger Hinweis darauf, auf welches UTF8\hy Zeichen die Fehlermeldung zur"uckgeht. Es k"onnte sich dabei etwa um das zweite Oktett der Dublette \texttt{195-165} f"ur å (\texttt{U+00E5}) handeln, aber vielleicht auch \texttt{194-165} f"ur ¥ (\texttt{U+00A5}), oder sonstwas. Oder ist es ASCII 165? Dann w"are vielleicht \v{e} gemeint (siehe \texttt{-t1}).} - \vspace{-1ex} + \vspace{-1.25ex} {\scriptsize\begin{verbatim} %%> Default encoding: Gave ASCIIs > 127 like 165 NO sorting weight. %% Did ignore all ASCIIs > 127. Start me using -utf8 or -t1 ? %% ******* \end{verbatim}} -\vspace{-3ex}\noindent -Unter \hspace{.2em}\verb|bibsort| \verb|-utf8| \hspace{.1em}\abra{...} -\hspace{.2em}werden die ersten zwanzig unbekannten UTF8\hy Zeichen gesammelt -und je Zeichen wird \textit{eine} Bildschirm\hy Meldung ausgegeben: +\vspace{-3.75ex}\noindent +Falls unter \verb|-utf8| dagegen UTF8\hy Zeichen \textit{unbekannt} sind, sammelt \verb|bibsort| +bis zu zwanzig und gibt am Ende je Zeichen \textit{eine} Bildschirm\hy Meldung aus: \vspace{-1ex} {\scriptsize\begin{verbatim} @@ -5445,17 +5456,17 @@ und je Zeichen wird \textit{eine} Bildschirm\hy Meldung ausgegeben: %% Better replace this sequence(s) by LaTeX-cmds in your text. \end{verbatim}} -\vspace{-3ex}\noindent +\vspace{-3.25ex}\noindent Auch das aktuelle \LaTeX\ gibt bei Verwendung dieser Zeichen Fehler aus. Falls Sie \hspace{.15em}\verb|\DeclareUnicodeCharacter{01EC}{\k{\@tabacckludge=O}}| \hspace{.2em}im Vorspann Ihrer \LaTeX\hy Datei definieren, w"urde eine Nutzung von \verb|U+01EC| das Zeichen drucken und die \LaTeX\hy Fehlermeldung ausschalten; -\verb|bibsort| 2.3 g"abe \verb|U+01EC| aber weiterhin kein Sortiergewicht. +\verb|bibsort| 2.4 g"abe \verb|U+01EC| aber weiterhin kein Sortiergewicht. Nutzung von \verb|\k{\=O}| im Text w"urde stattdessen \k{\=O} ausdrucken\footnote{In \texttt{\{tabbing\}}\hy Umgebungen w"are \texttt{\bs k\{\bs a=O\}} zu verwenden, weil \texttt{\bs=} dort Tabs setzt.} \textit{und} von \verb|bibarts| sortiert werden k"onnen. %%\k{\a=O}%% \vspace{.75ex} -\verb|-e| \hspace{.2em}ist eine weitere in Version 2.3 neue Option. Mit \hspace{.2em}\verb|\bibsort| \verb|-e| \hspace{.2em}werden die +\verb|-e| \hspace{.2em}ist seit Version 2.3 eine weitere Option. Mit \hspace{.2em}\verb|\bibsort| \verb|-e| \hspace{.2em}werden die Argumente von \verb|\vauthor|, \verb|\midvauthor| und \verb|\ntvautor| auf den \BibArts\hy \textit{Listen} vertauscht ausgedruckt (\kern-.0875em\textit{e}xchange). Damit werden Koautoren in der Notation \hspace{.1em}\textit{Nachname}\kern-.05em\verb|,| \hspace{-.1em}\textit{Vorname} \hspace{.15em}ausgedruckt, also wie der Hauptautor. @@ -5510,8 +5521,7 @@ k"onnen Sie (f"ur eigene Tests) im Vorspann das \hspace{.1em}\verb|%| \hspace{.15em}entfernen. Nach einem Durchlauf von \hspace{.3em}\LaTeX\,$+$\,\verb|bibsort| \verb|-utf8| \abra{...}\kern.2em$+$\kern.15em\LaTeX\ \hspace{.3em}sind u.\,a.\ alle UTF8\hy Zeichen (mit \verb|[U+|\fabra{...}\verb|]| als Kommentar) da, die -\hspace{.15em}\verb|bibsort| \hspace{.15em}in Version 2.3 erkennt: - +\hspace{.15em}\verb|bibsort| \hspace{.15em}in Version 2.4 erkennt: \newcommand{\demotext}[1]{\nosort{\protect\printdemotext{#1}}}% @@ -5901,6 +5911,18 @@ k"onnen Sie (f"ur eigene Tests) im Vorspann das \hspace{.1em}\verb|%| \addtoprr{st\demotext{ [U+FB06]}} \addtoprr{a\ b\demotext{ a[U+FEFF/nobreak]\bs\ b}} %% +%% neu in 2.4 [utf8enc.dfu 2021/06/21 v1.2n]: +\addtoprr{Ḟ\demotext{ [U+1E1E] \% neu in 2.4}} +\addtoprr{ḟ\demotext{ [U+1E1F] \% neu in 2.4}} +\addtoprr{Ḱ\demotext{ [U+1E30] \% neu in 2.4}} +\addtoprr{ḱ\demotext{ [U+1E31] \% neu in 2.4}} +\addtoprr{Ẏ\demotext{ [U+1E8E] \% neu in 2.4}} +\addtoprr{ẏ\demotext{ [U+1E8F] \% neu in 2.4}} +\addtoprr{Ẑ\demotext{ [U+1E90] \% neu in 2.4}} +\addtoprr{ẑ\demotext{ [U+1E91] \% neu in 2.4}} +\addtoprr{Ỳ\demotext{ [U+1EF2] \% neu in 2.4}} +\addtoprr{ỳ\demotext{ [U+1EF3] \% neu in 2.4}} +%% %% ... dies fuehren utf8-Zeichen aus in %% utf8enc.dfu 2021/01/27 v1.2l OHNE \cyr.../\CYR... \addtoprr{a\nobreakspace b}%siehe zugehoeriges \fillprr @@ -6232,6 +6254,19 @@ k"onnen Sie (f"ur eigene Tests) im Vorspann das \hspace{.1em}\verb|%| \addtoprr{st} \addtoprr{st} \addtoprr{a\protect\nobreak\ b\demotext{ a\bs protect\bs nobreak\bs\ b}} %%\addtoprr{a\ifhmode\nobreak\fi\ b}%% Kommt nicht im .prr-File an. %% +%% +%% neu in 2.4 [utf8enc.dfu 2021/06/21 v1.2n]: +\addtoprr{\.F} +\addtoprr{\.f} +\addtoprr{\@tabacckludge'K} +\addtoprr{\@tabacckludge'k} +\addtoprr{\.Y} +\addtoprr{\.y} +\addtoprr{\^Z} +\addtoprr{\^z} +\addtoprr{\@tabacckludge`Y} +\addtoprr{\@tabacckludge`y} +%% \fi %%% \addtoprr{b\texttwooldstyle\demotext{ \ b\bs texttwooldstyle}} @@ -6554,9 +6589,9 @@ k"onnen Sie (f"ur eigene Tests) im Vorspann das \hspace{.1em}\verb|%| \addtoprr{b@2} \addtoprr{b|2\demotext{ b\protect\string|2}} \addtoprr{b+2} -\addtoprr{b-2} +\addtoprr{b-2\demotext{ \ \ \ b{\protect\string-}2}} \addtoprr{b--2\demotext{ \ b{\protect\string-}{\protect\string-}2}} -\addtoprr{b---2\demotext{ b{\protect\string-}{\protect\string-}{\protect\string-}2}} +%\addtoprr{b---2\demotext{ b{\protect\string-}{\protect\string-}{\protect\string-}2}} \addtoprr{Ae} \addtoprr{Ac} \addtoprr{Af} @@ -6590,6 +6625,7 @@ k"onnen Sie (f"ur eigene Tests) im Vorspann das \hspace{.1em}\verb|%| \addtoprr{$\mathring{b}$\demotext{ \$\bs mathring\{b\}\$ \ \%neu in 2.1}} \addtoprr{\b{b}\demotext{ \bs b\{b\}}} \addtoprr{\c{b}\demotext{ \bs c\{b\}}} +\addtoprr{\textcommabelow{b}\demotext{ \bs textcommabelow\{b\}}} \addtoprr{\k{b}\demotext{ \bs k\{b\}}} \addtoprr{\d{b}\demotext{ \bs d\{b\}}} \addtoprr{\H{b}\demotext{ \bs H\{b\}}} @@ -6806,7 +6842,7 @@ k"onnen Sie (f"ur eigene Tests) im Vorspann das \hspace{.1em}\verb|%| \addtoprr{b \index{X} b\demotext{ \ \ b \bs index\{X\} b}} \addtoprr{b\glossary{X}b\demotext{ \ b\bs glossary\{X\}b}} \addtoprr{b \label{X1} b\demotext{ \ \ \protect\,b \bs label\{X1\} b}} -\addtoprr{b \pageref{X1} b\demotext{ b \bs pageref\{X1\} b}} +\addtoprr{b \pageref{X1} b\demotext{ \ b \bs pageref\{X1\} b}} \addtoprr{b \baref{X2} b\demotext{ \ b \bs baref\{X2\} b}} \addtoprr{b \balabel{X2} b\demotext{ \ \ \ b \bs balabel\{X2\} b}} \addtoprr{b \protect\pageref{X1} b\demotext{ b \bs protect\bs pageref\{X1\} b}} @@ -6854,7 +6890,7 @@ k"onnen Sie (f"ur eigene Tests) im Vorspann das \hspace{.1em}\verb|%| \fillprr{\textcolonmonetary}{\demotext{ \bs textcolonmonetary}} \addtoprr{¥\demotext{ [U+00A5]}} \addtoprr{\textyen} - \fillprr{\textyen}{\demotext{ \bs textyen \ \ \ \% new in 2.3}} + \fillprr{\textyen}{\demotext{ \bs textyen \ \ \ \% neu in 2.3}} %\addtoprr{₦\demotext{ [U+20A6]}} % \addtoprr{\textnaira} % \fillprr{\textnaira}{\demotext{ \bs textnaira}} @@ -7286,7 +7322,7 @@ Der erste Satz.\footnote{\kli{Ferguson}{Falscher Krieg}[23].\vspace{1ex}}} \vfill \hbox{\parbox{7.7cm}{\footnotesize\noindent -\textbf{\BibArts~2.3 \ (9 Dateien, 8 vom 06.\,12.\,2021):} \\[.85ex] +\textbf{\BibArts~2.4 \ (9 Dateien, 8 vom 10.\,01.\,2022):} \\[.85ex] \begin{tabular}{ll}% \texttt{README.txt} & Versionsgeschichte seit 1.3 \\[-1.75pt] \texttt{bibarts.sty} & Das \LaTeX-Style-File \\[-1.75pt] diff --git a/Master/texmf-dist/doc/latex/bibarts/bibsort.exe b/Master/texmf-dist/doc/latex/bibarts/bibsort.exe index b39ceaa2eca..fa454940db7 100755 Binary files a/Master/texmf-dist/doc/latex/bibarts/bibsort.exe and b/Master/texmf-dist/doc/latex/bibarts/bibsort.exe differ diff --git a/Master/texmf-dist/source/latex/bibarts/bibsort.c b/Master/texmf-dist/source/latex/bibarts/bibsort.c index 0841620e757..cc094f10bf3 100644 --- a/Master/texmf-dist/source/latex/bibarts/bibsort.c +++ b/Master/texmf-dist/source/latex/bibarts/bibsort.c @@ -1,5 +1,5 @@ -/* BibArts 2.3 assists you to write LaTeX texts in arts and humanities. */ -/* Copyright (C) 2021 Timo Baumann bibarts[at]gmx.de (2021/12/06) */ +/* BibArts 2.4 assists you to write LaTeX texts in arts and humanities. */ +/* Copyright (C) 2022 Timo Baumann bibarts[at]gmx.de (2022/01/10) */ /* This program is free software; you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -46,7 +46,7 @@ The C-compiled binary of this file is reading LaTeX .aux files. It can NOT read the .bar files, which BibArts 1.x did use. - BibArts 2.3 ONLY has an EMULATION for 1.3 texts: Keep copies of 1.x? + BibArts 2.4 ONLY has an EMULATION for 1.3 texts: Keep copies of 1.x? */ @@ -4164,8 +4164,8 @@ static char *thtwentyfive_oheightyfour[] = { "", /* 225 184 155 e with tilde below (not v1.2l) */ "", /* 225 184 156 [\\u{\\c{E}}] (not v1.2l) */ "", /* 225 184 157 [\\u{\\c{e}}] (not v1.2l) */ - "", /* 225 184 158 \\.F (not v1.2l) */ - "", /* 225 184 159 \\.f (not v1.2l) */ + "\\.F", /* 225 184 158 new in 2.4 */ + "\\.f", /* 225 184 159 new in 2.4 */ "\\=G", /* 225 184 160 */ "\\=g", /* 225 184 161 */ "", /* 225 184 162 \\.H (not v1.2l) */ @@ -4182,8 +4182,8 @@ static char *thtwentyfive_oheightyfour[] = { "", /* 225 184 173 i with tilde below (not v1.2l) */ "", /* 225 184 174 \\\'{\\\"I} (not v1.2l) */ "", /* 225 184 175 \\\'{\\\"{\\i}} (not v1.2l) */ - "", /* 225 184 176 \\\'K (not v1.2l) */ - "", /* 225 184 177 \\\'k (not v1.2l) */ + "\\\'K", /* 225 184 176 new in 2.4 */ + "\\\'k", /* 225 184 177 new in 2.4 */ "", /* 225 184 178 \\d{K} (not v1.2l) */ "", /* 225 184 179 \\d{k} (not v1.2l) */ "", /* 225 184 180 \\b{K} (not v1.2l) */ @@ -4288,6 +4288,83 @@ char *get_thtwentyfive_oheightyfive(unsigned char c) } +static char *thtwentyfive_oheightysix[] = { + "", /* 225 186 128 \\`W (not v1.2l) */ + "", /* 225 186 129 \\`w (not v1.2l) */ + "", /* 225 186 130 \\\'W (not v1.2l) */ + "", /* 225 186 131 \\\'w (not v1.2l) */ + "", /* 225 186 132 \\\"W (not v1.2l) */ + "", /* 225 186 133 \\\"w (not v1.2l) */ + "", /* 225 186 134 \\.W (not v1.2l) */ + "", /* 225 186 135 \\.w (not v1.2l) */ + "", /* 225 186 136 \\d{W} (not v1.2l) */ + "", /* 225 186 137 \\d{w} (not v1.2l) */ + "", /* 225 186 138 \\.X (not v1.2l) */ + "", /* 225 186 139 \\.x (not v1.2l) */ + "", /* 225 186 140 \\\"X (not v1.2l) */ + "", /* 225 186 141 \\\"x (not v1.2l) */ + "\\.Y", /* 225 186 142 new in 2.4 */ + "\\.y", /* 225 186 143 new in 2.4 */ + "\\^Z", /* 225 186 144 new in 2.4 */ + "\\^z", /* 225 186 145 new in 2.4 */ + "", /* 225 186 146 \\d{Z} (not v1.2l) */ + "", /* 225 186 147 \\d{z} (not v1.2l) */ + "", /* 225 186 148 Z with line below (not v1.2l) */ + "", /* 225 186 149 z with line below (not v1.2l) */ + "", /* 225 186 150 h with line below (not v1.2l) */ + "", /* 225 186 151 \\\"t (not v1.2l) */ + "", /* 225 186 152 \\r{w} */ + "", /* 225 186 153 \\r{y} */ + "", /* 225 186 154 a with right half ring (not v1.2l) */ + "", /* 225 186 155 long s with dot above (not v1.2l) */ + "", /* 225 186 156 long s with diagonal stroke (not v1.2l) */ + "", /* 225 186 157 long s with high stroke (not v1.2l) */ + "{\\SS}", /* 225 186 158 */ + "", /* 225 186 159 \\delta (not v1.2l) */ + "", /* 225 186 160 \\d{A} (not v1.2l) */ + "", /* 225 186 161 \\d{a} (not v1.2l) */ + "", /* 225 186 162 A with hook above (not v1.2l) */ + "", /* 225 186 163 a with hook above (not v1.2l) */ + "", /* 225 186 164 A with circumflex-acute (not v1.2l) */ + "", /* 225 186 165 a with circumflex-acute (not v1.2l) */ + "", /* 225 186 166 A with circumflex-grave (not v1.2l) */ + "", /* 225 186 167 a with circumflex-grave (not v1.2l) */ + "", /* 225 186 168 A with circumflex-hook (not v1.2l) */ + "", /* 225 186 169 a with circumflex-hook (not v1.2l) */ + "", /* 225 186 170 \\~{\\^A} (not v1.2l) */ + "", /* 225 186 171 \\~{\\^a} (not v1.2l) */ + "", /* 225 186 172 \\d{\\^A} (not v1.2l) */ + "", /* 225 186 173 \\d{\\^a} (not v1.2l) */ + "", /* 225 186 174 A with breve-acute (not v1.2l) */ + "", /* 225 186 175 a with breve-acute (not v1.2l) */ + "", /* 225 186 176 A with breve-grave (not v1.2l) */ + "", /* 225 186 177 a with breve-grave (not v1.2l) */ + "", /* 225 186 178 A with breve-hook (not v1.2l) */ + "", /* 225 186 179 a with breve-hook (not v1.2l) */ + "", /* 225 186 180 A with breve-tilde (not v1.2l) */ + "", /* 225 186 181 a with breve-tilde (not v1.2l) */ + "", /* 225 186 182 \\d{\\u{A}} (not v1.2l) */ + "", /* 225 186 183 \\d{\\u{a}} (not v1.2l) */ + "", /* 225 186 184 \\d{E} (not v1.2l) */ + "", /* 225 186 185 \\d{e} (not v1.2l) */ + "", /* 225 186 186 E with hook above (not v1.2l) */ + "", /* 225 186 187 e with hook above (not v1.2l) */ + "", /* 225 186 188 \\~E (not v1.2l) */ + "", /* 225 186 189 \\~e (not v1.2l) */ + "", /* 225 186 190 E with circumflex-acute (not v1.2l) */ + "", /* 225 186 191 e with circumflex-acute (not v1.2l) */ + NULL }; + +#define THTWENTYFIVE_OHEIGHTYSIX 186 + +char *get_thtwentyfive_oheightysix(unsigned char c) +{ + if (c >= UTF_BLOCK_BEGIN && c <= UTF_BLOCK_END) /* 128 ... 191 */ + return thtwentyfive_oheightysix[c-UTF_BLOCK_BEGIN]; + else return ""; +} + + static char *thtwentysix_ohtwentyeight[] = { "", /* 226 128 128 en quad (not v1.2l) */ "", /* 226 128 129 em quad (not v1.2l) */ @@ -4613,8 +4690,11 @@ int reg_utf_eight(int l, int val, char ch[UTF_EIGHT_MAXERR][UTF_EIGHT_MAXLEN+1], { i = 0; while (i < l && ch[entry][i] == *(p+i) && *(p+i) != '\0') ++i; - if (ch[entry][i] == '\0' && *(p+i) == '\0') /* (i == l) for valids */ - { + if ( i > 0 /* i > 0 added in 2.4 */ + && ch[entry][i] == '\0' + && (*(p+i) == '\0' || i == l) /* i == l added in 2.4 */ + ) + { found = 1; break; } @@ -4648,7 +4728,7 @@ int utf_eight_err(const char *p) else if (c >= QUADRUPLES_BEGIN && c <= QUADRUPLES_END) l = 4; /* 240 ... 244 */ - /* l == 1 falls \GenericError bliebe. */ + /* l == 1 if \GenericError stays and the char is in its arguments */ if (l >= 1) { utf_err_c = reg_utf_eight(l, utf_err_c, err_utf_eight, p); @@ -4744,8 +4824,14 @@ void get_utf_eight(char in[], const char *p) if (signeless(*(p+1)) == THTWENTYFIVE_OHEIGHTYFIVE) pos = insposmaxstr(in, get_thtwentyfive_oheightyfive(*(p+2)), pos, MAXLEN-1); else - if (signeless(*(p+1)) == 186 && signeless(*(p+2)) == 158) - pos = insposmaxstr(in, "{\\SS}", pos, MAXLEN-1); /* 225 186 158 */ + if (signeless(*(p+1)) == THTWENTYFIVE_OHEIGHTYSIX) + pos = insposmaxstr(in, get_thtwentyfive_oheightysix(*(p+2)), pos, MAXLEN-1); + else + if (signeless(*(p+1)) == 187 && signeless(*(p+2)) == 178) + pos = insposmaxstr(in, "\\`Y", pos, MAXLEN-1); /* 225 187 178 new in 2.4 */ + else + if (signeless(*(p+1)) == 187 && signeless(*(p+2)) == 179) + pos = insposmaxstr(in, "\\`y", pos, MAXLEN-1); /* 225 187 179 new in 2.4 */ } else if (a == THTWENTYSIX) @@ -4797,8 +4883,6 @@ void get_utf_eight(char in[], const char *p) } in[pos] = '\0'; - - /* printf("%% \"%s\"\n", in); */ /* !!!! */ } @@ -6052,7 +6136,7 @@ void printfilelist(FILE *file, int filec, int cc, const char *vor, const char *n int i = 0; if (cc == 1) - fprintf(file, "\n%%%% BibArts 2.3 (C) Timo Baumann 2021 [%s]\n", __DATE__); + fprintf(file, "\n%%%% BibArts 2.4 (C) Timo Baumann 2022 [%s]\n", __DATE__); fprintf(file, "%%%%\n"); timestamp(file); @@ -8495,7 +8579,7 @@ void print_utf_msg(const char err[UTF_EIGHT_MAXERR][UTF_EIGHT_MAXLEN+1], int err while (j < err_c && j < UTF_EIGHT_MAXERR) { printf("%%%%> %s utf8 sequence ", msg_a); - if (err[j][1] == '\0') printf("beginning with char "); + if (err[j][1] == '\0') printf("consisting only of char "); /* msg changed in 2.4 */ i = 0; while(err[j][i] != '\0') { printf("%d", ((unsigned char)err[j][i])); if(err[j][i+1] != '\0') printf("-"); ++i; } a = ((unsigned char)err[j][0]); @@ -8540,8 +8624,8 @@ int main(int argc, char *argv[]) char *inname = mydefault, *arg_i = NULL, *arg_o = NULL; - printf("\n%%%%> This is bibsort 2.3 (for help: %s -\?)\n", getmyname(argv[0], 37)); - fprintf(stderr, "%%%% bibsort 2.3 is part of BibArts 2.3 (C) Timo Baumann 2021.\n"); + printf("\n%%%%> This is bibsort 2.4 (for help: %s -\?)\n", getmyname(argv[0], 37)); + fprintf(stderr, "%%%% bibsort 2.4 is part of BibArts 2.4 (C) Timo Baumann 2022.\n"); argc = single_option(argc, argv, "-B", "-b"); diff --git a/Master/texmf-dist/tex/latex/bibarts/bibarts.sty b/Master/texmf-dist/tex/latex/bibarts/bibarts.sty index c3c449f5e6d..ccd48ba3128 100644 --- a/Master/texmf-dist/tex/latex/bibarts/bibarts.sty +++ b/Master/texmf-dist/tex/latex/bibarts/bibarts.sty @@ -1,5 +1,5 @@ -%% BibArts 2.3 assists you to write LaTeX texts in arts and humanities. -%% Copyright (C) 2021 Timo Baumann bibarts[at]gmx.de (2021/12/06) +%% BibArts 2.4 assists you to write LaTeX texts in arts and humanities. +%% Copyright (C) 2022 Timo Baumann bibarts[at]gmx.de (2022/01/10) %% %% This program is free software; you can redistribute it and/or modify %% it under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ %% COMPATIBILITY %% Change \DeclareRobustCommand into \def before using LaTeX 2.09. %% Then, you still NOT have to \protect BibArts-cmds in args of v-cmds. -%% BibArts 2.3 ONLY has an EMULATION for 1.3 texts: Keep copies of 1.x? +%% BibArts 2.4 ONLY has an EMULATION for 1.3 texts: Keep copies of 1.x? @@ -72,7 +72,7 @@ \def\errmessage@ba#1{{\protectchars@active\errmessage{#1.^^J \space. . . . . . . . . . . }}} -\typeout@ba{Style Option BibArts, Version 2.3 [2021] ...} +\typeout@ba{Style Option BibArts, Version 2.4 [2022] ...} \def\msg@bafontsubst#1#2{\typeout@ba{{\string#1 ...} is unknown; I'll substitute {\string#2 ...}.}} @@ -98,7 +98,7 @@ \def\baabkcorr{\bacorr} \def\balistcorr{\bacorr} \def\bakntsepcorr{\bacorr} -%% Only \barefcorr is not yet unified in 2.3 %% +%% Only \barefcorr is not yet unified in 2.4 %% \def\setup@ba#1#2{\let\@bahdtest-{#1{% \ifdim\fontdimen\@ne\font=\z@{\ignorespaces #2\ba@textmode\iflasthasdot@ba{\global\let\@bahdtest+}{}}\else @@ -1099,6 +1099,8 @@ \def\onlykurz##1{##1}% %% Umgekehrt in \@herefunctions \def\vauthor##1##2{\kauthor{##2}}% %% Vgl. \@hereFfunctions %% \def\midvauthor##1##2{\kauthor{##2}{\nsep}\ignorespaces}% + \def\v@uthor##1##2{\kauthor{##1}}% %% new in 2.4 %% + \def\m@dvauthor##1##2{\kauthor{##1}{\nsep}\ignorespaces}% \def\sort##1{}% } @@ -3958,7 +3960,7 @@ \def\addtobib{\addtoarq{}} \newif\if@oldba\@oldbafalse \def\makebar{\typeout@ba{ \space ***** \space That is obviously a file based on BibArts 1.x \space ***** - ^^J \space ***** \space BibArts 2.3 starts compatibility mode for 1.3 \space *****}% + ^^J \space ***** \space BibArts 2.4 starts compatibility mode for 1.3 \space *****}% \def\bibarts{\BibArts}% \def\schrift{}% \def\barschrift{}% -- cgit v1.2.3