diff options
Diffstat (limited to 'macros')
68 files changed, 446 insertions, 170 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.pdf Binary files differindex 1301c66b5c..8eb02d6a0a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.tex b/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.tex index 11de6321f2..0f831ec57a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/biblatex-german-legal.tex @@ -20,8 +20,8 @@ url={https://git.linta.de/?p=~brodo/biblatex-german-legal.git;a=summary}, author={Dominik Brodowski}, email={dominik.brodowski@uni-saarland.de}, - revision={002}, - date={2020-11-15}} + revision={003}, + date={2023-02-22}} \hypersetup{% pdftitle={Das \sty{biblatex-german-legal}-Paket}, @@ -40,7 +40,7 @@ \section{Einführung} -Wie nützlich es ist, \LaTeX{} bzw. seine Varianten für das Setzen von Texten und \biblatex{} für die Automatisierung von Zitaten, Referenzen bzw. Fundstellen zu nutzen, sei an dieser Stelle nicht wiederholt.\footnote{Ein Plädoyer liefert beispielsweise das ">Nachbarpaket"< \url{https://www.ctan.org/pkg/biblatex-jura2} in seiner Dokumentation.} Statt dessen möchte ich nur auf eines von mutmaßlich vielen Beispielen für juristische Monographien verweisen,\footnote{Namentlich \cite{Brodowski:2016}.} die vollständig in \LaTeX{} gesetzt und dessen Referenzen mit \biblatex{} verwaltet wurden. +Wie nützlich es ist, \LaTeX{} bzw. seine Varianten für das Setzen von Texten und \biblatex{} für die Automatisierung von Zitaten, Referenzen bzw. Fundstellen zu nutzen, sei an dieser Stelle nicht wiederholt.\footnote{Ein Plädoyer liefert beispielsweise das ">Nachbarpaket"< \url{https://www.ctan.org/pkg/biblatex-jura2} in seiner Dokumentation.} Statt dessen möchte ich nur auf eines von mutmaßlich vielen Beispielen für juristische Monographien verweisen,\footnote{Namentlich \cite{Brodowski:2023}; diese Monographie wurde mit Version~003 dieses Pakets gesetzt.} die vollständig in \LaTeX{} gesetzt und dessen Referenzen mit \biblatex{} verwaltet wurden. \subsection{Über das Paket \sty{biblatex-german-legal}} @@ -52,7 +52,7 @@ Allerdings sind die juristischen Zitierstile speziell. Sie unterscheiden sich ma \subsection{Mitarbeit} -Mitarbeit an diesem Paket ist sehr gerne gesehen! Schicken Sie mir hierzu bitte Änderungsvorschläge (idealerweise in Code) an die angegebene E-Mail-Adresse mit Ihrem Einverständnis, dies -- auch in abgewandelter Form -- in eine zukünftige Veröffentlichung dieses Pakets zu intergrieren. Hierfür eignet sich als Kurform das sogenannte ">Developer Certificate of +Mitarbeit an diesem Paket ist sehr gerne gesehen! Schicken Sie mir hierzu bitte Änderungsvorschläge (idealerweise in Code) an die angegebene E-Mail-Adresse mit Ihrem Einverständnis, dies -- auch in abgewandelter Form -- in eine zukünftige Veröffentlichung dieses Pakets zu intergrieren. Hierfür eignet sich als Kurzform das sogenannte ">Developer Certificate of Origin"<.\footnote{\url{https://developercertificate.org/}.} \section{Verwendung} @@ -82,11 +82,15 @@ Folgende Aufrufoption ist implementiert: Diese Option steuert, ob in den Zitierungen im Manuskript bei Büchern und Kommentaren die Auflagen\textit{nummer} mit abgedruckt wird. +\boolitem[true]{switchprefix} + +Diese Option steuert, ob Namenspräfixe wie ">von"< in den Fußnoten vor dem Nachnamen (z.B. ">von Liszt"<), im Literaturverzeichnis aber nach dem Vornamen (z.B. ">Liszt, Franz von"<) ausgegeben werden. + \end{optionlist} \subsection{Eintragstypen} -\sty{german-legal-book} kann mit Zitationen von Aufsätzen,\footnote{Dies gilt sowohl für Beiträge in Zeitschriften, die nach Jahren zitiert werden, z.B. \cite[107]{Radbruch_SJZ_1946_105}, als auch in solchen, die nach Bänden zitiert werden, z.B. \cite[295 \psqq]{NaginPogarsky_JQC_20_295}.} Monographien,\footcite[4]{Brodowski:2016} Beiträgen in Sammelbänden\footnote{\cite[211]{Vogel_Beck:2011}; auch mit Zitierung nach Randnummern: \cite[3 \psqq]{Moestl_HdbStR:179:2010}.} sowie Festschriften\footcite[408 \psq]{Koriath_FS_Jung}, Kommentaren\footnote{Dies gilt sowohl für Einzelautorenkommentare, z.B. \cite[\S\,248c Rn.~1 \psqq{}]{Fischer66}, für einbändige Kommentare, z.B. \cite[Bosch][§\,248c Rn.~1 \psq{}]{SchoenkeSchroeder30}, als auch für mehrbändige \mbox{(Groß-)}""Kommentare, z.B. \cite[Lüderssen/Jahn][§\,140 Rn.~1]{LR26}.} und Online-Quellen\footnote{Exemplarisch \cite{Mordkommission:2015}.} umgehen. Die seiten- oder randnummerngenaue Fundstelle wird jeweils in eckigen Klammern mit angegeben, erforderlichenfalls mit Verweis auf die folgende oder die folgenden Seiten: +\sty{german-legal-book} kann mit Zitationen von Aufsätzen,\footnote{Dies gilt sowohl für Beiträge in Zeitschriften, die nach Jahren zitiert werden, z.B. \cite[107]{Radbruch_SJZ_1946_105}, als auch in solchen, die nach Bänden zitiert werden, z.B. \cite[295 \psqq]{NaginPogarsky_JQC_20_295}.} Monographien,\footnote{\cite[42]{Brodowski:2023}; \cite[2]{Liszt:1927}.} Beiträgen in Sammelbänden\footnote{\cite[211]{Vogel_Beck:2011}; auch mit Zitierung nach Randnummern: \cite[3 \psqq]{Moestl_HdbStR:179:2010}.} sowie Festschriften\footcite[408 \psq]{Koriath_FS_Jung}, Kommentaren\footnote{Dies gilt sowohl für Einzelautorenkommentare, z.B. \cite[\S\,248c Rn.~1 \psqq{}]{Fischer67}, für einbändige Kommentare, z.B. \cite[Bosch][§\,248c Rn.~1 \psq{}]{SchoenkeSchroeder30}, als auch für mehrbändige \mbox{(Groß-)}""Kommentare, z.B. \cite[Jahn][§\,140 Rn.~1]{LR27}; \cite[\commentator{Tiedemann_Vogel}][§\,264a Rn.~116]{LK12}.} und Online-Quellen\footnote{Exemplarisch \cite{Mordkommission:2015}.} umgehen. Die seiten- oder randnummerngenaue Fundstelle wird jeweils in eckigen Klammern mit angegeben, erforderlichenfalls mit Verweis auf die folgende oder die folgenden Seiten: \begin{ltxcode} \cite[295 \psqq]{NaginPogarsky_JQC_20_295} @@ -131,7 +135,7 @@ year = {2011}, } @book{FS_Jung, -editor = {Heinz Müller-Dietz and Egon Müller and Karl-Ludwig Kunz and% +editor = {Heinz Müller-Dietz and Egon Müller and Karl-Ludwig Kunz and % Henning Radtke and Guido Britz and Carsten Momsen and Heinz Koriath}, year = {2007}, address = {Baden-Baden}, @@ -139,21 +143,22 @@ title = {Festschrift für Heike Jung zum 65. Geburtstag am 23. April 2007}, shorttitle = {FS Jung}, } -@book{Brodowski:2016, +@book{Brodowski:2023, author = {Dominik Brodowski}, -title = {Verdeckte technische Überwachungsmaßnahmen im Polizei- und% - Strafverfahrensrecht}, -subtitle = {Zur rechtsstaatlichen und rechtspraktischen Notwendigkeit% - eines einheitlichen operativen Ermittlungsrechts}, -shorttitle = {Verdeckte technische Überwachungsmaßnahmen}, -address = {Tübingen}, -year = {2016}, +title = {Die Evolution des Strafrechts}, +subtitle = {Strafverfassungsrechtliche, europastrafrechtliche und % + kriminalpolitische Wirkungen auf Strafgesetzgebung}, +year = {2023}, +address = {Baden-Baden}, +publisher = {Nomos}, +doi = {10.5771/9783748930457}, +isbn = {978-3-8487-8676-3}, } \end{ltxcode} \subsubsection{Beiträge in Sammelbänden} -Hat man den Sammelband als \bibtype{book} deklariert, so lassen sich einzelne Beiträge in diesem Sammelband als \bibtype{inbook} knapp unter Angabe des Autors (\bibfield{author}), des Beitragstitels (\bibfield{title}), der Seitenspanne (\bibtype{pages}) sowie unter Angabe eines Querverweises (\bibfield{crossref}) deklarieren: +Hat man den Sammelband als \bibtype{book} deklariert, so lassen sich einzelne Beiträge in diesem Sammelband als \bibtype{inbook} knapp unter Angabe des Autors (\bibfield{author}), des Beitragstitels (\bibfield{title}), der Seitenspanne (\bibtype{pages}) sowie unter Angabe eines Querverweises (\bibfield{crossref}) deklarieren. Soll das Buch selbst nicht im Literaturverzeichnis erscheinen, muss bei dessen Eintra dort ">options = \{skipbib\}"< ergänzt werden.\footnote{Um im Falle uneindeutiger Nachnamen zusätzlich die Initialen oder den vollen Vornamen ausgeben zu können, muss intern zunächst ">mincrossref=1"< gesetzt werden. Das hat an sich zur Folge, dass neben dem zitierten Beitrag auch der Sammelband usw. im Literaturverzeichnis mit aufgeführt wird. Dies lässt sich indes durch ">options = \{skipbib\}"< vermeiden. Beispiel: \cite{Guenther_Jung:1991}; \cite{Neumann_JURA_2017_160}; \cite{Guenther_NJW_1982_353}.} \begin{ltxcode} @inbook{Vogel_Beck:2011, @@ -178,7 +183,7 @@ crossref = {HdbStR:VIII}, \subsubsection{Beiträge in Festschriften} -Gleiches gilt für Festschriften, wobei hier der Eintragstyp \bibtype{incollection} zu verwenden ist und in der Deklaration des Buches die Kurzbezeichnung (\bibfield{shorttitle}) deklariert werden muss: +Gleiches gilt für Festschriften, wobei hier der Eintragstyp \bibtype{incollection} zu verwenden ist und in der Deklaration des Buches die Kurzbezeichnung (\bibfield{shorttitle}) deklariert werden muss. \begin{ltxcode} @incollection{Koriath_FS_Jung, @@ -194,20 +199,31 @@ crossref = {FS_Jung}, Einzelautorenkommentare werden wie Bücher (\bibtype{book}) behandelt, alle übrigen (ein- und mehrbändigen) Kommentare mit \bibtype{commentary} deklariert. Dann ist die Kurzbezeichnung des Kommentars als \bibfield{shorthand} anzugeben. Verwendet man \bibtype{commentary}, ist der Bearbeiter bei der Zitation in eckingen Klammern mit anzugeben: \begin{ltxcode} -\cite[Lüderssen/Jahn][§\,140 Rn.~1]{LR26} +\cite[Jahn][§\,140 Rn.~1]{LR27} +\end{ltxcode} + +Alternativ kann statt des Autorennamens auch mittels \bibfield{commentator} auf einen Bibliographie-Eintrag verwiesen werden, sei es auf einen bestehenden anderen Eintrag, sei es auf einen speziellen \bibtype{commentator}-Eintrag. Dann werden die Namen der Autor*innen durch \biblatex{} formatiert. + +\begin{ltxcode} +\cite[\commentator{Tiedemann_Vogel}][§\,264a Rn.~116]{LK12} + +@commentator{Tiedemann_Vogel, +author = {Klaus Tiedemann and Joachim Vogel}, +} \end{ltxcode} In der Literaturangabe können auch Begründer*innen (Begr.), Fortführer*innen (Fortgef.) und Kommentator*innen (Komm.) angegeben werden, wie nachfolgend am Beispiel des Schönke-Schröder-Kommentars gezeigt werden möge: \begin{ltxcode} -@commentary{LR26, -title = {Löwe-Rosenberg}, -subtitle = {Die Strafprozeßordnung und das Gerichtsverfassungsgesetz}, +@commentary{LR27, +title = {Löwe"=Rosenberg}, shorthand = {LR}, -edition = {26}, -date = {2006/2014}, -editor = {Volker Erb and Robert Esser and Ulrich Franke and% - Kirsten Graalmann-Scheerer and Hans Hilger and Alexander Ignor}, +edition = {27}, +subtitle = {Die Strafprozeßordnung und das Gerichtsverfassungsgesetz. % + Großkommentar}, +date = {2016/}, +editor = {Jörg"=Peter Becker and Volker Erb and Robert Esser and % + Kirsten Graalmann"=Scheerer and Hans Hilger and Alexander Ignor}, } @commentary{SchoenkeSchroeder30, @@ -226,11 +242,11 @@ title = {Strafgesetzbuch}, year = {2019}, } -@book{Fischer66, +@book{Fischer67, author = {Thomas Fischer}, -edition = {66}, +edition = {67}, address = {München}, -year = {2019}, +year = {2020}, title = {Strafgesetzbuch mit Nebengesetzen}, shorttitle = {StGB}, } @@ -262,20 +278,19 @@ shorttitle = {Abschlussbericht}, %%% Beispieleinträge für das Literaturverzeichnis \begin{filecontents*}{biblatex-german-legal.bib} -@book{Brodowski:2016, +@book{Brodowski:2023, author = {Dominik Brodowski}, -title = {Verdeckte technische Überwachungsmaßnahmen im Polizei- und Strafverfahrensrecht}, -subtitle = {Zur rechtsstaatlichen und rechtspraktischen Notwendigkeit eines einheitlichen operativen Ermittlungsrechts}, -shorttitle = {Verdeckte technische Überwachungsmaßnahmen}, -address = {Tübingen}, -publisher = {Mohr Siebeck}, -series = {Tübinger Rechtswissenschaftliche Abhandlungen}, -number = {119}, -year = {2016}, -isbn = {978-3-16-154302-9}, -size = {XXXIII, 649}, -comment = {Diss. Tübingen 2015}, -note = {Zugl.: Tübingen, Univ., Diss., 2015}, +title = {Die Evolution des Strafrechts}, +subtitle = {Strafverfassungsrechtliche, europastrafrechtliche und kriminalpolitische Wirkungen auf Strafgesetzgebung}, +year = {2023}, +address = {Baden-Baden}, +publisher = {Nomos}, +series = {Neue Schriften zum Strafrecht}, +number = {21}, +comment = {Habil. Frankfurt/Main 2021}, +note = {Zugl.: Frankfurt/Main, Univ., Habil., 2021}, +doi = {10.5771/9783748930457}, +isbn = {978-3-8487-8676-3}, } @article{Radbruch_SJZ_1946_105, @@ -300,6 +315,7 @@ editor = {Susanne Beck and Christoph Burchard and Bijan Fateh-Moghadam}, title = {Strafrechtsvergleichung als Problem und Lösung}, address = {Baden-Baden}, year = {2011}, +options = {skipbib}, } @inbook{Vogel_Beck:2011, @@ -315,6 +331,15 @@ year = {2007}, address = {Baden-Baden}, title = {Festschrift für Heike Jung zum 65. Geburtstag am 23. April 2007}, shorttitle = {FS Jung}, +options = {skipbib}, +} + +@book{Liszt:1927, +author = {von Liszt, Franz}, +title = {Lehrbuch des deutschen Strafrechts}, +edition = {25}, +address = {Berlin}, +year = {1927}, } @incollection{Koriath_FS_Jung, @@ -324,22 +349,32 @@ pages = {397--409}, crossref = {FS_Jung}, } -@book{Fischer66, +@book{Fischer67, author = {Thomas Fischer}, -edition = {66}, +edition = {67}, address = {München}, -year = {2019}, +year = {2020}, title = {Strafgesetzbuch mit Nebengesetzen}, shorttitle = {StGB}, } -@commentary{LR26, -title = {Löwe-Rosenberg}, -subtitle = {Die Strafprozeßordnung und das Gerichtsverfassungsgesetz}, +@commentary{LR27, +title = {Löwe"=Rosenberg}, shorthand = {LR}, -edition = {26}, -date = {2006/2014}, -editor = {Volker Erb and Robert Esser and Ulrich Franke and Kirsten Graalmann-Scheerer and Hans Hilger and Alexander Ignor}, +edition = {27}, +subtitle = {Die Strafprozeßordnung und das Gerichtsverfassungsgesetz. Großkommentar}, +date = {2016/}, +editor = {Jörg"=Peter Becker and Volker Erb and Robert Esser and Kirsten Graalmann"=Scheerer and Hans Hilger and Alexander Ignor}, +} + +@commentary{LK12, +shorthand = {LK}, +edition = {12}, +date = {2007/2015}, +editor = {Heinrich Wilhelm Laufhütte and Ruth {Rissing"=van Saan} and Klaus Tiedemann}, +title = {Strafgesetzbuch. Leipziger Kommentar}, +subtitle = {Großkommentar}, +address = {Berlin}, } @commentary{SchoenkeSchroeder30, @@ -383,6 +418,43 @@ pagination = {section}, crossref = {HdbStR:VIII}, } +@commentator{Tiedemann_Vogel, +author = {Klaus Tiedemann and Joachim Vogel}, +} + +@article{Neumann_JURA_2017_160, +author = {Laura Katharina Sophia Neumann}, +year = {2017}, +journal = {JURA}, +pages = {160--170}, +title = {Klassische und aktuelle Probleme der Strafbarkeit nicht genehmigter Kraftfahrzeugrennen}, +} + +@book{Jung:1991, +title = {Recht und Moral}, +subtitle = {Beiträge zu einer Standortbestimmung}, +editor = {Heike Jung and Heinz Müller-Dietz and Ulfrid Neumann}, +address = {Baden"=Baden}, +year = {1991}, +options = {skipbib}, +} + +@inbook{Guenther_Jung:1991, +title = {Möglichkeiten einer diskursethischen Begründung des Strafrechts}, +pages = {205--217}, +author = {Klaus Günther}, +crossref = {Jung:1991}, +} + +@article{Guenther_NJW_1982_353, +author = {Hans-Ludwig Günther}, +year = {1982}, +journal = {NJW}, +pages = {353--358}, +title = {Lebenslang für ">heimtückischen Mord"<?}, +subtitle = {Das Mordmerkmal ">Heimtücke"< nach dem Beschluß des Großen Senats für Strafsachen}, +} + \end{filecontents*} \end{document} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/german-legal-book.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/german-legal-book.bbx index 5d75929af2..4ba6fbe103 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/german-legal-book.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/german-legal-book.bbx @@ -1,4 +1,4 @@ -\ProvidesFile{german-legal-book.bbx}[2020/03/13 v001] +\ProvidesFile{german-legal-book.bbx}[2023/02/22 v003] %%% license: LPPL 1.3c or later %%% author-maintainer: Dominik Brodowski, dominik.brodowski@uni-saarland.de @@ -21,14 +21,20 @@ %%% überschrieben werden. \ExecuteBibliographyOptions{% %%% - %%% Sortierung nach Name, dann Titel, dann Jahr, - sorting = nty,% + %%% Sortierung nach Name, dann Jahr, dann Titel, + sorting = nyt,% %%% %%% Maximale Anzahl der in einer Fußnoten-Zitation wiedergegebenen Namen maxcitenames = 4,% %%% %%% Anzahl der Namen, die vor "u.a." angegeben werden - mincitenames = 4,% + mincitenames = 1,% + %%% + %%% Maximale Anzahl der im Literaturverzeichnis wiedergegebenen Namen + maxbibnames = 10,% + %%% + %%% Anzahl der Namen, die vor "u.a." angegeben werden + minbibnames = 1,% %%% %%% Sollen "klickbare" Querverweise gesetzt werden? hyperref = true,% @@ -50,6 +56,9 @@ %%% Querverweise auf andere Einträge im Literaturverzeichnis. citexref = false,% %%% + %%% Datumsangaben sollen möglichst kompakt ausgegeben werden. + date = short,% + %%% %%% "van Beethoven" soll unter "B" und nicht unter "v" einsortiert werden. useprefix = false,% %%% @@ -63,6 +72,36 @@ %%% bzw. derselben Autorenkombination, wird die wiederholte Angabe des %%% Autors durch einen Gedankenstrich ersetzt. dashed = true,% + %%% + %%% Sämtliche Autoren- bzw. Herausgebernamen sollen herangezogen werden, + %%% um im Falle uneindeutiger Nachnamen zusätzlich die Initialen oder den + %%% vollen Vornamen auszugeben. ACHTUNG: Dies erfordert es, bei Sammelbänden + %%% usw. mit @crossref zu arbeiten und die Ausgabe des Sammelbandes im + %%% Literaturverzeichnis mittels "options = {skipbib}" zu unterbinden. + uniquename = allfull,% + mincrossrefs = 1,% +} + +%%% Mit der Option "switchprefix" wird angegeben, ob Namenspräfixe wie +%%% "von" in den Fußnoten *vor* dem Nachnamen (z.B. "von Liszt"), im +%%% Literaturverzeichnis aber -- der Standardsortierung entsprechend -- +%%% nachgestellt erscheinen sollen (z.B. "Liszt, Franz von"). Der +%%% Standard ist "true", d.h. um dies zu unterbinden, muss +%%% "switchprefix=false" als Option gesetzt werden. +\newbool{prefix:switch} +\setboolean{prefix:switch}{true} +\DeclareBibliographyOption[boolean]{switchprefix}[true]{% + \setboolean{prefix:switch}{#1}% +} +\AtEveryCite{% + \ifbool{prefix:switch}{% + \toggletrue{blx@useprefix}% + }{}% +} +\AtBeginBibliography{% + \ifbool{prefix:switch}{% + \togglefalse{blx@useprefix}% + }{}% } @@ -77,19 +116,17 @@ \renewcommand*{\mkbibnamesuffix}[1]{\mkbibemph{#1}} %%% Mehrere Autorennamen werden durch einen Schrägstrich getrennt. Dieser -%%% ist -- wie die Autorennamen selbst (siehe soeben) -- kursiv zu setzen. -%%% Achtung: dieser muss hier als \slash ausgegeben werden (und nicht als -%%% \addslash), weil andernfalls \unspace mit aufgerufen wird und das -%%% vorherige \addspace rückgängig macht... +%%% ist -- anders als die Autorennamen (siehe soeben) -- recte zu setzen. \AtBeginBibliography{ - \renewcommand*{\multinamedelim}{\addspace\mkbibemph{\slash}\addspace}% - \renewcommand*{\finalnamedelim}{\addspace\mkbibemph{\slash}\addspace}% + \renewcommand*{\multinamedelim}{{\normalfont{\addslash}}}% + \renewcommand*{\finalnamedelim}{{\normalfont{\addslash}}}% } -%%% Sämtliche Namen sollen in der Reihenfolge "Nachname, Vorname" ausgegeben -%%% werden -\DeclareNameAlias{default}{family-given} +%%% Autorennamen sollen in der Reihenfolge "Nachname, Vorname" ausgegeben +%%% werden, weitere Namen (z.B. der Herausgeber) in der Reihenfolge +%%% "Vorname Nachname" \DeclareNameAlias{sortname}{family-given} +\DeclareNameAlias{default}{given-family} %%% Buch- und Beitragstitel usw. sind aufrecht zu setzen \DeclareFieldFormat{title}{\normalfont{#1}} @@ -106,6 +143,17 @@ \clearfield{note}% } +%%% "u.a." soll ohne Trenner und nicht kursiv ausgegeben werden +\DefineBibliographyStrings{german}{% + andothers = {u.a.} +} +\xpatchbibmacro{name:andothers}{% + \bibstring{andothers}% +}{% + {\normalfont{\bibstring{andothers}}}% +}{}{} + + %%% "Hrsg." soll in Klammern abgedruckt werden. Hierzu wird der Texttrenner %%% entfernt und das Makro, dass "Hrsg." ausgibt, durch die Befehle %%% \bibopenparen und \bibopenclose umrandet. @@ -126,6 +174,14 @@ \xpretobibmacro{translator+othersstrg}{\addspace\bibopenparen}{}{} \xapptobibmacro{translator+othersstrg}{\bibcloseparen}{}{} +%%% in manchen Versionen wird der Doppelpunkt nicht aufrecht gesetzt... +%%% daher wird dieser Befehl hier entsprechend re-implementiert +\renewbibmacro*{in:}{% + \bibstring{in}% + \addcolon% + \newunit\newblock% +} + %%% Bei @article und @periodical soll bevorzugt das Feld "shortjournal" %%% statt "journaltitle" oder "journal" verwendet werden. \renewbibmacro*{journal}{% @@ -143,6 +199,25 @@ \DeclareFieldFormat{url}{\url{#1}} +%%% In "kurzen" Datumsangaben date=short soll kein thinspace zwischen +%%% Tag, Monat und Jahr ausgegeben werden. +\DefineBibliographyExtras{german}{% + \protected\def\mkbibdateshort#1#2#3{% + \iffieldundef{#3}% + {}% + {\mkdayzeros{\thefield{#3}}\adddot% + \iffieldundef{#2}{}{}}% + \iffieldundef{#2}% + {}% + {\mkmonthzeros{\thefield{#2}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#3}{/}{\adddot}}}% + \iffieldbibstring{#1}% + {\bibstring{\thefield{#1}}}% + {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}% +} + %%%%%%%%%%%%%%% %%% article %%% %%%%%%%%%%%%%%% @@ -274,6 +349,9 @@ %%% Wird wie book definiert; keine Änderungen! \DeclareBibliographyAlias{commentary}{book} +%%% Für Kommentatoren +\DeclareBibliographyAlias{commentator}{misc} +\ExecuteBibliographyOptions[commentator]{skipbib=true} \endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/german-legal-book.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/german-legal-book.cbx index 7c18a20dde..50853830d2 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/german-legal-book.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-german-legal/german-legal-book.cbx @@ -1,4 +1,4 @@ -\ProvidesFile{german-legal-book.cbx}[2020/03/13 v001] +\ProvidesFile{german-legal-book.cbx}[2023/02/22 v003] %%% license: LPPL 1.3c or later %%% author-maintainer: Dominik Brodowski, dominik.brodowski@uni-saarland.de @@ -42,10 +42,10 @@ %%%%%%%%%%%%%%%%%%%%%%%% %%% Mehrere Autorennamen werden durch einen Schrägstrich getrennt. Dieser -%%% ist -- wie die Autorennamen selbst (siehe bbx) -- kursiv zu setzen. +%%% ist -- anders als die Autorennamen (siehe bbx) -- recte zu setzen. \AtEveryCite{% - \renewcommand*{\multinamedelim}{\mkbibemph{\addslash}}% - \renewcommand*{\finalnamedelim}{\mkbibemph{\addslash}}% + \renewcommand*{\multinamedelim}{{\normalfont{\addslash}}}% + \renewcommand*{\finalnamedelim}{{\normalfont{\addslash}}}% } %%% cite:title wird normalerweise verwendet, um alles ab dem Beitragstitel @@ -77,7 +77,7 @@ %%% auszugeben. \DeclareFieldFormat{edition:super}{% \ifinteger{#1}{% - \textsuperscript{\tiny{#1}}% + \mkbibsuperscript{\tiny{#1}}% }{}% } @@ -220,6 +220,7 @@ %%% %%% in: \usebibmacro{in:}% + \midsentence% nach dem Doppelpunkt soll ein "von" usw. klein gesetzt werden. %%% %%% Hrsg. ... \usebibmacro{byeditor+others}% @@ -285,6 +286,16 @@ %%% folgt ein Komma \DeclareFieldFormat[commentary]{prenote}{\mkbibemph{#1}\addcomma}% +%%% Der Bearbeiter kann dabei entweder im Klartext angegeben werden, der +%%% dann unverändert ausgegeben wird, oder mit dem Befehl \commentator{citekey}: +%%% Dann werden die Autorennamen aus der Bibliographie entnommen und +%%% entsprechend formatiert. +\DeclareCiteCommand{\commentator} + {} + {\mkbibemph{\printnames[labelname]{author}}} + {} + {} + %%% Falls bei einem Kommentar "shorthand" angegeben ist, werden die %%% Herausgeber nicht (!) genannt. Hierzu wird der Befehl %%% \printnames{labelname} im allgemeinen Makro "textcite" unter die diff --git a/macros/latex/contrib/jeuxcartes/README.md b/macros/latex/contrib/jeuxcartes/README.md index 13bfc292bc..3593df51cc 100644 --- a/macros/latex/contrib/jeuxcartes/README.md +++ b/macros/latex/contrib/jeuxcartes/README.md @@ -8,5 +8,6 @@ Licence : Released under the LaTeX Project Public License v1.3c or later, see ht Poker v1 cards Image's Licence : LGPL-2.1 license https://github.com/htdebeer/SVG-cards Poker v2 cards Image's Licence : Public Domain https://tekeye.uk/playing_cards/svg-playing-cards Poker v3 cards Image's Licence : Public Domain https://www.me.uk/cards/ +Poker v4 cards Image's Licence : CC BY-SA 4.0 https://commons.wikimedia.org/wiki/File:Computer_screen_playing_cards_deck.svg Tarot v1 cards Image's Licence : Public Domain https://freesvg.org/deck-of-french-tarot-playing-cards Uno v1 cards Image's Licence : MIT License https://eperezcosano.github.io/uno-part1/
\ No newline at end of file diff --git a/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.pdf b/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.pdf Binary files differindex 7b8cac8486..dc600f8bb1 100644 --- a/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.pdf +++ b/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.pdf diff --git a/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.tex b/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.tex index 1420ae56bc..6273a6bbee 100644 --- a/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.tex +++ b/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.tex @@ -32,7 +32,24 @@ \cfoot{\sffamily \small - \thepage{} -} \rfoot{\hyperlink{matoc}{\small\faArrowAltCircleUp[regular]}} -\usepackage{hvlogos} +%\usepackage{hvlogos} +\usepackage{hologo} +\providecommand\tikzlogo{Ti\textit{k}Z} +\providecommand\TeXLive{\TeX{}Live\xspace} +\providecommand\PSTricks{\textsf{PSTricks}\xspace} +\let\pstricks\PSTricks +\let\TikZ\tikzlogo +\newcommand\TableauDocumentation{% + \begin{tblr}{width=\linewidth,colspec={X[c]X[c]X[c]X[c]X[c]X[c]},cells={font=\sffamily}} + {\huge \LaTeX} & & & & &\\ + & {\huge \hologo{pdfLaTeX}} & & & & \\ + & & {\huge \hologo{LuaLaTeX}} & & & \\ + & & & {\huge \TikZ} & & \\ + & & & & {\huge \TeXLive} & \\ + & & & & & {\huge \hologo{MiKTeX}} \\ + \end{tblr} +} + \usepackage{menukeys} \let\tab\relax \usepackage{tabto} @@ -52,8 +69,8 @@ \setlength{\parindent}{0pt} \definecolor{LightGray}{gray}{0.9} -\def\TPversion{0.2.1a} -\def\TPdate{28 Décembre 2022} +\def\TPversion{0.2.2a} +\def\TPdate{22 Février 2023} \usepackage[most]{tcolorbox} \usepackage[outputdir=build]{minted} @@ -157,14 +174,7 @@ Une commande pour des cartes en version \og miniatures \fg{} (individuelle, main \medskip -\begin{tblr}{width=\linewidth,colspec={X[c]X[c]X[c]X[c]X[c]X[c]},cells={font=\sffamily}} - {\huge \LaTeX} & & & & &\\ - & {\huge \pdfLaTeX} & & & & \\ - & & {\huge \LuaLaTeX} & & & \\ - & & & {\huge \TikZ} & & \\ - & & & & {\huge \TeXLive} & \\ - & & & & & {\huge \MiKTeX} \\ -\end{tblr} +\TableauDocumentation \medskip @@ -181,23 +191,25 @@ Une commande pour des cartes en version \og miniatures \fg{} (individuelle, main \tableofcontents -\vfill~ +\pagebreak \part{Historique} -{\small \bverb|v0.2.1a|~:~~~~Correction du nom d'une carte pokerv1... +{\small \bverb|v0.2.2a|~:~~~~Ajout d'un style v4 pour le Poker -{\small \bverb|v0.2.0 |~:~~~~Modification du design des cartes (pdf pour Poker/Uno + png pour Tarot) + alternatives pour le Poker +{\small \bverb|v0.2.1|~:~~~~Correction du nom d'une carte pokerv1... -{\small \bverb|v0.1.4 |~:~~~~Réduction de la taille des images \texttt{png} +{\small \bverb|v0.2.0|~:~~~~Modification du design des cartes (pdf pour Poker/Uno + png pour Tarot) + alternatives pour le Poker -{\small \bverb|v0.1.3 |~:~~~~Ajout de cartes Uno (CC1.0 par AlexDer) + modification des commandes + rami +{\small \bverb|v0.1.4|~:~~~~Réduction de la taille des images \texttt{png} -{\small \bverb|v0.1.2 |~:~~~~Modification du nom (et de la source) des images de Tarot (CC0) +{\small \bverb|v0.1.3|~:~~~~Ajout de cartes Uno (CC1.0 par AlexDer) + modification des commandes + rami -{\small \bverb|v0.1.1 |~:~~~~Ajout de commandes pour des mini-cartes +{\small \bverb|v0.1.2|~:~~~~Modification du nom (et de la source) des images de Tarot (CC0) -{\small \bverb|v0.1 |~:~~~~Version initiale +{\small \bverb|v0.1.1|~:~~~~Ajout de commandes pour des mini-cartes + +{\small \bverb|v0.1 |~:~~~~Version initiale \vfill~ @@ -212,7 +224,7 @@ Une commande pour des cartes en version \og miniatures \fg{} (individuelle, main \begin{codeidee} L'idée de ce package est de proposer, comme le fait \ctex{pst-poker}, des commandes pour intégrer des cartes de poker dans un document \LaTeX. -Les cartes sont des images : +Les cartes disponibles sont : : % \begin{itemize} % \item les cartes type \textsf{Poker} sont sous licence LGPL, \copyright{}2005, de David Bellot, via \url{https://github.com/htdebeer/SVG-cards} ; @@ -221,6 +233,7 @@ Les cartes sont des images : \item les cartes type \textsf{Poker v1} (Licence : LGPL-2.1 license) \url{https://github.com/htdebeer/SVG-cards} \item les cartes type \textsf{Poker v2} (Licence : Public Domain) \url{https://tekeye.uk/playing_cards/svg-playing-cards} \item les cartes type \textsf{Poker v3} (Licence : Public Domain) \url{https://www.me.uk/cards/} + \item les cartes type \textsf{Poker v4} (Licence : CC BY-SA 4.0) \url{https://commons.wikimedia.org/wiki/File:Computer_screen_playing_cards_deck.svg} \item les cartes type \textsf{Tarot} (Licence : Public Domain) \url{https://freesvg.org/deck-of-french-tarot-playing-cards} \item les cartes type \textsf{Uno} (Licence : MIT License) \url{https://eperezcosano.github.io/uno-part1/} % Uno v2 cards Image's Licence : CC1.0 https://alexder.itch.io/uno-card-game-asset-pack @@ -232,7 +245,7 @@ Le {package} \ctex{JeuxCartes} charge les {packages} : \begin{itemize} \item \ctex{tikz}, \ctex{pifont}, \ctex{xfp}, \ctex{pgffor}, \ctex{xinttools} ; - \item \ctex{listofitems}, \ctex{xstring}, \ctex{xparse} et \ctex{simplekv} ; + \item \ctex{listofitems}, \ctex{xstring} et \ctex{simplekv} ; \item \ctex{randomlist}, \ctex{xcolor} avec les options \ctex{[table,svgnames]}. \end{itemize} \end{codeinfo} @@ -311,8 +324,8 @@ Les \textsf{codes} seront présentés dans des \textsf{boîtes} \textcolor{red!7 Les \textit{Jeux} disponibles sont : \begin{itemize} - \item \Cle{Poker}, \Cle{Pokerv2}, \Cle{Pokerv3}, \Cle{Tarot} et \Cle{Uno} pour l'affichage des cartes ; - \item \Cle{Poker}, \Cle{Pokerv2}, \Cle{Pokerv3}, \Cle{Tarot}, \Cle{Bataille}, \Cle{Rami}, \Cle{Belote} et \Cle{Uno} pour les mains aléatoires ; + \item \Cle{Poker}, \Cle{Pokerv2}, \Cle{Pokerv3}, \Cle{Pokerv4}, \Cle{Tarot} et \Cle{Uno} pour l'affichage des cartes ; + \item \Cle{Poker}, \Cle{Pokerv2}, \Cle{Pokerv3}, \Cle{Pokerv4}, \Cle{Tarot}, \Cle{Bataille}, \Cle{Rami}, \Cle{Belote} et \Cle{Uno} pour les mains aléatoires ; \item \Cle{Poker} et \Cle{Tarot} pour les \textit{mini-}cartes. \end{itemize} \end{codeinfo} @@ -356,8 +369,8 @@ La commande \ctex{AffCartesJeu} affiche une liste de cartes ne mode \textit{côt \begin{codetex}[] \AffCarteJeu{VP}\AffCarteJeu{10K}\AffCarteJeu{AC}\AffCarteJeu{Dos}\AffCarteJeu{DT}\\ \\ -\AffCarteJeu[TypeJeu=Tarot]{VP}\AffCarteJeu[TypeJeu=Tarot]{Dos} -\AffCarteJeu[TypeJeu=Tarot]{Exc}\AffCarteJeu[TypeJeu=Tarot]{1AT} +\AffCarteJeu[TypeJeu=Tarot]{VP}\AffCarteJeu[TypeJeu=Tarot]{Dos}% +\AffCarteJeu[TypeJeu=Tarot]{Exc}\AffCarteJeu[TypeJeu=Tarot]{1AT}% \AffCarteJeu[TypeJeu=Tarot]{10K}\AffCarteJeu[TypeJeu=Tarot]{18AT}\\ \\ \AffCartesJeu[TypeJeu=Uno]{P4 § PTR § Coul § 7B § 8V} \end{codetex} @@ -457,12 +470,13 @@ On obtient la main \AffCartesJeu[Hauteur=2,TypeJeu=Uno]{9B § 8R § P2J § P4 § \subsection{Designs disponibles pour les cartes classiques} \begin{codeinfo} -Il existe 3 versions de design des cartes \textit{classiques}, accessibles via les clés : +Il existe 4 versions de designs des cartes \textit{classiques}, accessibles via les clés : \begin{itemize} \item \Cle{Poker} ; \item \Cle{Pokerv2} ; - \item \Cle{Pokerv3}. + \item \Cle{Pokerv3} ; + \item \Cle{Pokerv4}. \end{itemize} \end{codeinfo} @@ -473,6 +487,8 @@ Il existe 3 versions de design des cartes \textit{classiques}, accessibles via l \AffCartesJeu[Hauteur=2,TypeJeu=Pokerv2]{DK § AP § 10T § VP § 8T § RT § 9C} \\ \\ \textbf{Design v3} :\\ \AffCartesJeu[Hauteur=2,TypeJeu=Pokerv3]{DK § AP § 10T § VP § 8T § RT § 9C} \\ \\ +\textbf{Design v4} :\\ +\AffCartesJeu[Hauteur=2,TypeJeu=Pokerv4]{DK § AP § 10T § VP § 8T § RT § 9C} \\ \\ \end{codetex} \pagebreak @@ -496,7 +512,7 @@ Les commandes pour créer des \textit{mains} sont obligatoirement liées à des \subsection{Clés et options} \begin{codecles} -L'argument \textit{mandataire} correspond à la liste des cartes à afficher, sous la forme +L'argument \textit{obligatoire} correspond à la liste des cartes à afficher, sous la forme \begin{itemize} \item \texttt{<carte1> § <carte2> § ... § <carten>}. @@ -594,10 +610,10 @@ Les \Cle{options} sont les suivantes : En ce qui concerne les \textit{jeux} disponibles (non modifiables) : \begin{itemize} - \item \Cle{Poker} ou \Cle{Pokerv2} ou \Cle{Pokerv3} : 52 cartes (sans Joker) ; - \item \Cle{Belote} ou \Cle{Belotev2} ou \Cle{Belotev3} : 32 cartes (sans Joker) ; - \item \Cle{Bataille} ou \Cle{Bataillev2} ou \Cle{Bataillev3}: 54 cartes (avec Jokers) ; - \item \Cle{Rami} ou \Cle{Ramiv2} ou \Cle{Ramiv3} : 108 cartes (avec Jokers) ; + \item \Cle{Poker} ou \Cle{Pokerv2} ou \Cle{Pokerv3} ou \Cle{Pokerv4} : 52 cartes (sans Joker) ; + \item \Cle{Belote} ou \Cle{Belotev2} ou \Cle{Belotev3} ou \Cle{Belotev4} : 32 cartes (sans Joker) ; + \item \Cle{Bataille} ou \Cle{Bataillev2} ou \Cle{Bataillev3} ou \Cle{Bataillev4} : 54 cartes (avec Jokers) ; + \item \Cle{Rami} ou \Cle{Ramiv2} ou \Cle{Ramiv3} ou \Cle{Ramiv4} : 108 cartes (avec Jokers) ; \item \Cle{Tarot} : 78 cartes ; \item \Cle{Uno}. \end{itemize} @@ -733,6 +749,10 @@ Les \Cle{Clés} sont les mêmes que pour la commande individuelle, avec en plus \subsection{Poker/Bataille/Belote (v1)} +Dos disponibles : \texttt{Dos} + +\medskip + \xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[Hauteur=1.85]{#1P}} \xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[Hauteur=1.85]{#1C}} @@ -746,6 +766,10 @@ Les \Cle{Clés} sont les mêmes que pour la commande individuelle, avec en plus \subsection{Poker/Bataille/Belote (v2)} +Dos disponibles : \texttt{DosBleu} ou \texttt{DosRouge} ou \texttt{DosBleu2} ou \texttt{DosRouge2} + +\medskip + \xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv2,Hauteur=1.85]{#1P}} \xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv2,Hauteur=1.85]{#1C}} @@ -761,6 +785,10 @@ Les \Cle{Clés} sont les mêmes que pour la commande individuelle, avec en plus \subsection{Poker/Bataille/Belote (v3)} +Dos disponibles : \texttt{DosNoir} ou \texttt{DosRouge} + +\medskip + \xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{#1P}} \xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{#1C}} @@ -771,6 +799,24 @@ Les \Cle{Clés} sont les mêmes que pour la commande individuelle, avec en plus \AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{JN}\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{JR}\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{DosNoir}\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{DosRouge}% +\subsection{Poker/Bataille/Belote (v4)} + +Dos disponibles : \texttt{DosBleu} ou \texttt{DosRouge} + +\medskip + +\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{#1P}} + +\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{#1C}} + +\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{#1K}} + +\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{#1T}} + +\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{JN}\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{JR}\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{DosRouge}\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{DosBleu}% + +\pagebreak + \subsection{Cartes Tarot} \xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\AffCarteJeu[TypeJeu=Tarot,Hauteur=1.85]{#1P}} @@ -836,10 +882,10 @@ L'\textit{origine} des cartes est fixée, au coin bas-gauche, et la \Cle{Rotatio \begin{codetex}[] \begin{tikzpicture} \draw[thin,lightgray] (-5,-5) grid (5,3) ; %grille rajoutée pour la lisibilité du code - \foreach \ptsupport in {(0,0),(3,-4),(-3,-1),(-2,-3.5),(2,2.75),(-4.5,-4.5)}% + \foreach \ptsupport in {(0,0),(3,-4),(-3,-1),(-2,-3.5),(2,2.75),(-4.5,-4.5),,(1,-2.5)}% {\filldraw[Gray] \ptsupport circle[radius=2pt] ;} %poits rajouté pour la lisibilité du code - \foreach \x in {-5,-4,...,5} \draw[lightgray] (\x,-5) node[below,font=\small] {\x} ; - \foreach \y in {-5,-4,...,3} \draw[lightgray] (-5,\y) node[left,font=\small] {\y} ; + \foreach \x in {-5,-4,...,5} \draw[lightgray] (\x,-5) node[below,font=\small] {$\x$} ; + \foreach \y in {-5,-4,...,3} \draw[lightgray] (-5,\y) node[left,font=\small] {$\y$} ; \AffCarteJeu[Hauteur=2,Tikz=true,TikzAutonome=false]% {10C} \AffCarteJeu[TypeJeu=Pokerv2,Hauteur=2.5,Tikz=true,TikzAutonome=false,DecalageX=3,DecalageY=-4]% @@ -853,6 +899,9 @@ L'\textit{origine} des cartes est fixée, au coin bas-gauche, et la \Cle{Rotatio {18AT} \AffCarteJeu[TypeJeu=Uno,Hauteur=2,Tikz=true,TikzAutonome=false,DecalageX=-4.5,DecalageY=-4.5]% {P4} + \AffCarteJeu% + [TypeJeu=Pokerv4,Hauteur=1.75,Tikz=true,TikzAutonome=false,Rotation=-10,DecalageX=1,DecalageY=-2.5]% + {RP} \end{tikzpicture} \end{codetex} diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-10C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-10C.pdf Binary files differnew file mode 100644 index 0000000000..327e83e22c --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-10C.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-10K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-10K.pdf Binary files differnew file mode 100644 index 0000000000..aeaa7d994f --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-10K.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-10P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-10P.pdf Binary files differnew file mode 100644 index 0000000000..b0a868f000 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-10P.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-10T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-10T.pdf Binary files differnew file mode 100644 index 0000000000..e4eefa1181 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-10T.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-2C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-2C.pdf Binary files differnew file mode 100644 index 0000000000..6f9499e439 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-2C.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-2K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-2K.pdf Binary files differnew file mode 100644 index 0000000000..90baca0f2c --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-2K.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-2P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-2P.pdf Binary files differnew file mode 100644 index 0000000000..ac7f1db313 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-2P.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-2T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-2T.pdf Binary files differnew file mode 100644 index 0000000000..f91326101e --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-2T.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-3C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-3C.pdf Binary files differnew file mode 100644 index 0000000000..3b0cd4c825 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-3C.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-3K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-3K.pdf Binary files differnew file mode 100644 index 0000000000..42ccc76f68 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-3K.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-3P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-3P.pdf Binary files differnew file mode 100644 index 0000000000..8bca73f91a --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-3P.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-3T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-3T.pdf Binary files differnew file mode 100644 index 0000000000..e1541721fd --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-3T.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-4C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-4C.pdf Binary files differnew file mode 100644 index 0000000000..e9df534c4f --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-4C.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-4K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-4K.pdf Binary files differnew file mode 100644 index 0000000000..40856a0c9b --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-4K.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-4P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-4P.pdf Binary files differnew file mode 100644 index 0000000000..5a93edba70 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-4P.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-4T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-4T.pdf Binary files differnew file mode 100644 index 0000000000..fc9130a2ac --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-4T.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-5C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-5C.pdf Binary files differnew file mode 100644 index 0000000000..4d7d6c1475 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-5C.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-5K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-5K.pdf Binary files differnew file mode 100644 index 0000000000..124e16201c --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-5K.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-5P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-5P.pdf Binary files differnew file mode 100644 index 0000000000..f65169cf47 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-5P.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-5T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-5T.pdf Binary files differnew file mode 100644 index 0000000000..45b5ddd9ec --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-5T.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-6C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-6C.pdf Binary files differnew file mode 100644 index 0000000000..1216087b12 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-6C.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-6K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-6K.pdf Binary files differnew file mode 100644 index 0000000000..2a4e6c6c79 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-6K.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-6P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-6P.pdf Binary files differnew file mode 100644 index 0000000000..5316058ff5 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-6P.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-6T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-6T.pdf Binary files differnew file mode 100644 index 0000000000..d0bf59754b --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-6T.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-7C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-7C.pdf Binary files differnew file mode 100644 index 0000000000..3513a2bd0d --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-7C.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-7K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-7K.pdf Binary files differnew file mode 100644 index 0000000000..ce5ae47b0d --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-7K.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-7P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-7P.pdf Binary files differnew file mode 100644 index 0000000000..3f1c8cc387 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-7P.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-7T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-7T.pdf Binary files differnew file mode 100644 index 0000000000..d80cba718a --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-7T.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-8C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-8C.pdf Binary files differnew file mode 100644 index 0000000000..0a65a47c22 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-8C.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-8K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-8K.pdf Binary files differnew file mode 100644 index 0000000000..f03235dde7 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-8K.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-8P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-8P.pdf Binary files differnew file mode 100644 index 0000000000..3bb002a1e3 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-8P.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-8T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-8T.pdf Binary files differnew file mode 100644 index 0000000000..c66e82563c --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-8T.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-9C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-9C.pdf Binary files differnew file mode 100644 index 0000000000..9b0888ab7c --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-9C.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-9K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-9K.pdf Binary files differnew file mode 100644 index 0000000000..5cf0a862f2 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-9K.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-9P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-9P.pdf Binary files differnew file mode 100644 index 0000000000..5381890146 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-9P.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-9T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-9T.pdf Binary files differnew file mode 100644 index 0000000000..89f1bc16a4 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-9T.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-AC.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-AC.pdf Binary files differnew file mode 100644 index 0000000000..c0fc161f09 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-AC.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-AK.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-AK.pdf Binary files differnew file mode 100644 index 0000000000..53363cefc8 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-AK.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-AP.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-AP.pdf Binary files differnew file mode 100644 index 0000000000..a74874dca9 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-AP.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-AT.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-AT.pdf Binary files differnew file mode 100644 index 0000000000..d84a2277f8 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-AT.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DC.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DC.pdf Binary files differnew file mode 100644 index 0000000000..8fc4ed3cb2 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DC.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DK.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DK.pdf Binary files differnew file mode 100644 index 0000000000..833c386b2c --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DK.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DP.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DP.pdf Binary files differnew file mode 100644 index 0000000000..7172e72417 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DP.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DT.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DT.pdf Binary files differnew file mode 100644 index 0000000000..ea1757152e --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DT.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DosBleu.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DosBleu.pdf Binary files differnew file mode 100644 index 0000000000..7c4dd6760c --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DosBleu.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DosRouge.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DosRouge.pdf Binary files differnew file mode 100644 index 0000000000..1e415ddd5b --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-DosRouge.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-JN.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-JN.pdf Binary files differnew file mode 100644 index 0000000000..ed660d030b --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-JN.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-JR.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-JR.pdf Binary files differnew file mode 100644 index 0000000000..ded3000199 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-JR.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-RC.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-RC.pdf Binary files differnew file mode 100644 index 0000000000..f479d143c0 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-RC.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-RK.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-RK.pdf Binary files differnew file mode 100644 index 0000000000..0596445940 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-RK.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-RP.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-RP.pdf Binary files differnew file mode 100644 index 0000000000..a5d8f9977c --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-RP.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-RT.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-RT.pdf Binary files differnew file mode 100644 index 0000000000..d5861dc464 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-RT.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-VC.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-VC.pdf Binary files differnew file mode 100644 index 0000000000..735c95b08b --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-VC.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-VK.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-VK.pdf Binary files differnew file mode 100644 index 0000000000..a524ae12f2 --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-VK.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-VP.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-VP.pdf Binary files differnew file mode 100644 index 0000000000..f6c20146ff --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-VP.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-VT.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-VT.pdf Binary files differnew file mode 100644 index 0000000000..77f10dafec --- /dev/null +++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv4-VT.pdf diff --git a/macros/latex/contrib/jeuxcartes/tex/JeuxCartes.sty b/macros/latex/contrib/jeuxcartes/tex/JeuxCartes.sty index c37e0334e6..a94f30eefb 100644 --- a/macros/latex/contrib/jeuxcartes/tex/JeuxCartes.sty +++ b/macros/latex/contrib/jeuxcartes/tex/JeuxCartes.sty @@ -3,21 +3,24 @@ % Poker v1 cards Image's Licence : LGPL-2.1 license https://github.com/htdebeer/SVG-cards % Poker v2 cards Image's Licence : Public Domain https://tekeye.uk/playing_cards/svg-playing-cards % Poker v3 cards Image's Licence : Public Domain https://www.me.uk/cards/ +% Poker v4 cards Image's Licence : CC BY-SA 4.0) https://commons.wikimedia.org/wiki/File:Computer_screen_playing_cards_deck.svg % Tarot v1 cards Image's Licence : Public Domain https://freesvg.org/deck-of-french-tarot-playing-cards % Uno v1 cards Image's Licence : MIT License https://eperezcosano.github.io/uno-part1/ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{JeuxCartes}[2022/12/27 v0.2.1 Jeux de cartes] -% 0.2.1 Correction d'un bug avec une carte de poker... -% 0.2.0 Modification des images (en mode pdf !) + v3 Poker + réduction taille Tarot -% 0.1.7 Correction d'un bug avec les noms de Uno -% 0.1.5 Ajout v2 pour le Poker -% 0.1.4 Réduction de la taille des images -% 0.1.3 Ajout de cartes Uno (CC1.0 par AlexDer) + modification des commandes + rami -% Amélioration de la qualité des cartes de Tarot (sans augmenter la taille) -% 0.1.2 Modification du nom (et de la source) des images de Tarot (CC0) -% 0.1.1 Ajout de commandes pour des mini-cartes -% 0.1 Version initiale +\ProvidesPackage{JeuxCartes}[2023/02/22 v0.2.2a Jeux de cartes] +% 0.2.2a Correction de 2 cartes de pokerv4 +% 0.2.2 Ajout d'un style v4 pour le poker +% 0.2.1a Correction d'un bug avec une carte de poker... +% 0.2.0 Modification des images (en mode pdf !) + v3 Poker + réduction taille Tarot +% 0.1.7 Correction d'un bug avec les noms de Uno +% 0.1.5 Ajout v2 pour le Poker +% 0.1.4 Réduction de la taille des images +% 0.1.3 Ajout de cartes Uno (CC1.0 par AlexDer) + modification des commandes + rami +% Amélioration de la qualité des cartes de Tarot (sans augmenter la taille) +% 0.1.2 Modification du nom (et de la source) des images de Tarot (CC0) +% 0.1.1 Ajout de commandes pour des mini-cartes +% 0.1 Version initiale %------Packages utiles \RequirePackage{graphicx} @@ -65,8 +68,11 @@ \IfStrEq{\AffCarteJeuType}{Pokerv2}%poker2 {\def\CartePrefixe{CaJ-PokeRv2-}}{}% %cas pokerv3 - \IfStrEq{\AffCarteJeuType}{Pokerv3}%poker2 + \IfStrEq{\AffCarteJeuType}{Pokerv3}%poker3 {\def\CartePrefixe{CaJ-PokeRv3-}}{}% + %cas pokerv4 + \IfStrEq{\AffCarteJeuType}{Pokerv4}%poker4 + {\def\CartePrefixe{CaJ-PokeRv4-}}{}% %cas tarot \IfStrEq{\AffCarteJeuType}{Tarot}%tarot {\def\CartePrefixe{CaJ-TaroTv1-}}{}% @@ -157,6 +163,8 @@ {\def\HauteurGenerique{8.5}\def\CarteMainPrefixe{CaJ-PokeRv2-}}{}% \IfStrEq{\MainJeuType}{Pokerv3}%poker3 {\def\HauteurGenerique{8.5}\def\CarteMainPrefixe{CaJ-PokeRv3-}}{}% + \IfStrEq{\MainJeuType}{Pokerv4}%poker4 + {\def\HauteurGenerique{8.5}\def\CarteMainPrefixe{CaJ-PokeRv4-}}{}% \IfStrEq{\MainJeuType}{Tarot}%tarot {\def\HauteurGenerique{5.5}\def\CarteMainPrefixe{CaJ-TaroTv1-}}{}% \IfStrEq{\MainJeuType}{Uno}%uno @@ -228,6 +236,8 @@ {\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv2}\xdef\CarteDebutRand{\fpeval{randint(0,52-#2)}}}{}% \IfStrEq{\MainJeuType}{Pokerv3}%pokerv3 {\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv3}\xdef\CarteDebutRand{\fpeval{randint(0,52-#2)}}}{}% + \IfStrEq{\MainJeuType}{Pokerv4}%pokerv4 + {\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv4}\xdef\CarteDebutRand{\fpeval{randint(0,52-#2)}}}{}% \IfStrEq{\MainJeuType}{Uno}%uno {\def\HauteurGenerique{8.5}\def\CarteMainType{Uno}\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}}{}% % \IfStrEq{\MainJeuType}{Unov2}%unov2 @@ -238,18 +248,24 @@ {\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv2}\xdef\CarteDebutRand{\fpeval{randint(0,54-#2)}}}{}% \IfStrEq{\MainJeuType}{Bataillev3}%bataillev3 {\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv3}\xdef\CarteDebutRand{\fpeval{randint(0,54-#2)}}}{}% + \IfStrEq{\MainJeuType}{Bataillev4}%bataillev4 + {\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv4}\xdef\CarteDebutRand{\fpeval{randint(0,54-#2)}}}{}% \IfStrEq{\MainJeuType}{Belote}%belote {\def\HauteurGenerique{8.5}\def\CarteMainType{Poker}\xdef\CarteDebutRand{\fpeval{randint(0,32-#2)}}}{}% \IfStrEq{\MainJeuType}{Belotev2}%belotev2 {\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv2}\xdef\CarteDebutRand{\fpeval{randint(0,32-#2)}}}{}% - \IfStrEq{\MainJeuType}{Belotev2}%belotev3 + \IfStrEq{\MainJeuType}{Belotev3}%belotev3 {\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv3}\xdef\CarteDebutRand{\fpeval{randint(0,32-#2)}}}{}% + \IfStrEq{\MainJeuType}{Belotev4}%belotev4 + {\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv4}\xdef\CarteDebutRand{\fpeval{randint(0,32-#2)}}}{}% \IfStrEq{\MainJeuType}{Rami}%rami {\def\HauteurGenerique{8.5}\def\CarteMainType{Poker}\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}}{}% \IfStrEq{\MainJeuType}{Ramiv2}%ramiv2 {\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv2}\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}}{}% \IfStrEq{\MainJeuType}{Ramiv3}%ramiv3 {\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv3}\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}}{}% + \IfStrEq{\MainJeuType}{Ramiv4}%ramiv4 + {\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv4}\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}}{}% \IfStrEq{\MainJeuType}{Tarot}%tarot {\def\HauteurGenerique{6.375}\def\CarteMainType{Tarot}\xdef\CarteDebutRand{\fpeval{randint(0,78-#2)}}}{}% %échelle relative des cartes @@ -280,6 +296,12 @@ \do{\InsertRandomItem{CartesJeuMelange}{##1}}% }% {}% + \IfStrEq{\MainJeuType}{Pokerv4}%si c'est le pokerv4 + {% + \xintFor* ##1 in {\xintCSVtoList{\CartesJeuPoker}}% + \do{\InsertRandomItem{CartesJeuMelange}{##1}}% + }% + {}% \IfStrEq{\MainJeuType}{Bataille}%si c'est la bataille {% \xintFor* ##1 in {\xintCSVtoList{\CartesJeuBataille}}% @@ -298,6 +320,12 @@ \do{\InsertRandomItem{CartesJeuMelange}{##1}}% }% {}% + \IfStrEq{\MainJeuType}{Bataillev4}%si c'est la bataillev4 + {% + \xintFor* ##1 in {\xintCSVtoList{\CartesJeuBataille}}% + \do{\InsertRandomItem{CartesJeuMelange}{##1}}% + }% + {}% \IfStrEq{\MainJeuType}{Rami}%si c'est le rami {% \xintFor* ##1 in {\xintCSVtoList{\CartesJeuRami}}% @@ -316,6 +344,12 @@ \do{\InsertRandomItem{CartesJeuMelange}{##1}}% }% {}% + \IfStrEq{\MainJeuType}{Ramiv4}%si c'est le ramiv4 + {% + \xintFor* ##1 in {\xintCSVtoList{\CartesJeuRami}}% + \do{\InsertRandomItem{CartesJeuMelange}{##1}}% + }% + {}% \IfStrEq{\MainJeuType}{Uno}%si c'est le uno {% \xintFor* ##1 in {\xintCSVtoList{\CartesJeuUno}}% @@ -346,6 +380,12 @@ \do{\InsertRandomItem{CartesJeuMelange}{##1}}% }% {}% + \IfStrEq{\MainJeuType}{Belotev4}%si c'est la belotev4 + {% + \xintFor* ##1 in {\xintCSVtoList{\CartesJeuBelote}}% + \do{\InsertRandomItem{CartesJeuMelange}{##1}}% + }% + {}% \IfStrEq{\MainJeuType}{Tarot}%si c'est le tarot {% \xintFor* ##1 in {\xintCSVtoList{\CartesJeuTarot}}% diff --git a/macros/latex/contrib/ragged2e/README.md b/macros/latex/contrib/ragged2e/README.md index cc7f6fa363..0c8ecc4865 100644 --- a/macros/latex/contrib/ragged2e/README.md +++ b/macros/latex/contrib/ragged2e/README.md @@ -1,8 +1,8 @@ -# The `ragged2e' package +# The `ragged2e` package -Copyright (C) Martin Schröder, 1996–2019, Marei Peischl (peiTeX) <marei@peitex.de>, 2021–2022 +Copyright (C) Martin Schröder, 1996–2019, Marei Peischl (peiTeX) <marei@peitex.de>, 2021–2023 - ragged2e 2022/11/13 v3.2 + ragged2e 2023/02/22 v3.3 *************************************************************************** @@ -40,5 +40,6 @@ or want to report a suggestion for improvement, please visit * 3.0 Move from everysel package to lthooks * 3.1 Robustify the user macros (Thanks for Markus Kohm for the hint) * 3.2 Fix bug adding a parskip when using `\newline` within the raggged2e alignments (Thanks to Maurice Hansen for reporting) + * 3.3 Only modify the alignment when one of the ragged2e commands is active diff --git a/macros/latex/contrib/ragged2e/ragged2e.dtx b/macros/latex/contrib/ragged2e/ragged2e.dtx index ecc4ff40a3..817f1d6676 100644 --- a/macros/latex/contrib/ragged2e/ragged2e.dtx +++ b/macros/latex/contrib/ragged2e/ragged2e.dtx @@ -2,7 +2,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Copyright (C) Martin Schröder, 1996–2019 -% Marei Peischl (peiTeX) <marei@peitex.de>, 2021–2022 +% Marei Peischl (peiTeX) <marei@peitex.de>, 2021–2023 % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c @@ -31,7 +31,7 @@ % \iffalse \NeedsTeXFormat{LaTeX2e}[2021/06/01] %<package>\ProvidesPackage{ragged2e} -%<package> [2022/11/13 v3.2 ragged2e Package] +%<package> [2023/02/22 v3.3 ragged2e Package] % %<*driver> \documentclass[a4paper]{ltxdoc} @@ -41,6 +41,11 @@ \usepackage{url} \usepackage{array} \usepackage{tabularx} +\makeatletter +\IfFileExists{gitHeadInfo.gin}{ + \newcommand*{\GI@githeadinfo@file}{gitHeadInfo.gin} +}{} +\makeatother \usepackage{gitinfo2} \usepackage{geometry} \usepackage{booktabs} @@ -76,7 +81,7 @@ \end{document} %</driver> % \fi -% \CheckSum{490} +% \CheckSum{518} % %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -134,7 +139,7 @@ % \title{\unskip % The \textsf{ragged2e}-package^^A % \thanks{^^A -% The version number of this file is \fileversion, +% The version number of this file is \fileversion, % revision~\#\gitAbbrevHash, last revised \protect\gitAuthorIsoDate.}^^A % } % \author{Martin Schröder\\\url{https://gitlab.com/TeXhackse/ragged2e}\thanks{maintained by Marei Peischl}} @@ -144,7 +149,7 @@ % ^^A ----------------------------- % % \begin{abstract} -% This package provides new commands and environments for setting +% This package provides new commands and environments for setting % ragged text which are easy to configure to allow hyphenation. % An earlier attempt to do this was the style % \package{raggedright}\,\cite{raggedri} by the same author. @@ -167,11 +172,11 @@ % \changes{v3.0}{2021/02/05}{Change maintenance status} % \section{The problem} % ^^A -% \LaTeX{} has three commands (\cs{centering}, \cs{raggedleft}, and +% \LaTeX{} has three commands (\cs{centering}, \cs{raggedleft}, and % \cs{raggedright}) and three environments (\env{center}, % \env{flushleft}, and \env{flushright}) to typeset ragged text. % The environments are based upon the commands (\env{center} uses -% \cs{centering}, \env{flushleft} \cs{raggedright}, and +% \cs{centering}, \env{flushleft} \cs{raggedright}, and % \env{flushright} \cs{raggedleft}). % % These commands have, however, one serious flaw: they render @@ -287,8 +292,8 @@ % \DescribeMacro{\Centering} % \DescribeMacro{\RaggedLeft} % \DescribeMacro{\RaggedRight} -% \cs{Centering}, \cs{RaggedLeft}, and \cs{RaggedRight} can be used in -% the same way as \cs{centering}, \cs{raggedleft}, and +% \cs{Centering}, \cs{RaggedLeft}, and \cs{RaggedRight} can be used in +% the same way as \cs{centering}, \cs{raggedleft}, and % \cs{raggedright}: % Just type the command, and after that the whole text will be set % centered, ragged-left or ragged-right. @@ -320,23 +325,23 @@ % \cs{RaggedXSpaceskip}}% % \begin{tabularx}{\linewidth}{lX}\toprule % Command & Uses\tabularnewline \midrule -% \cs{Centering} & \cs{CenteringLeftskip}, +% \cs{Centering} & \cs{CenteringLeftskip}, % \cs{CenteringRightskip}, % \cs{CenteringParfillskip}, % \cs{CenteringParindent} % \tabularnewline -% \cs{RaggedLeft} & \cs{RaggedLeftLeftskip}, +% \cs{RaggedLeft} & \cs{RaggedLeftLeftskip}, % \cs{RaggedLeftRightskip}, % \cs{RaggedLeftParfillskip}, % \cs{RaggedLeftParindent} % \tabularnewline -% \cs{RaggedRight} & \cs{RaggedRightLeftskip}, +% \cs{RaggedRight} & \cs{RaggedRightLeftskip}, % \cs{RaggedRightRightskip}, % \cs{RaggedRightParfillskip}, % \cs{RaggedRightParindent} % \tabularnewline -% \cs{justifying} & \cs{JustifyingParfillskip}, -% \cs{JustifyingParindent} +% \cs{justifying} & \cs{JustifyingParfillskip}, +% \cs{JustifyingParindent} % \tabularnewline % \bottomrule % \end{tabularx} @@ -350,7 +355,7 @@ % \DescribeMacro{\CenteringLeftskip} % \DescribeMacro{\RaggedLeftLeftskip} % \DescribeMacro{\RaggedRightLeftskip} -% These are the \cs{leftskip}s inserted by \cs{Centering}, +% These are the \cs{leftskip}s inserted by \cs{Centering}, % \cs{RaggedLeft}, and \cs{RaggedRight}. % \begin{Quote} % \setlength{\tabcolsep}{.25em} @@ -394,8 +399,8 @@ % \cite[p.~274]{KnuthTeXa} % \end{tabularx} % \end{Quote} -% The normal setting for \cs{parfillskip} is |0pt plus 1fil|; the -% parameters are provided for testing combinations of +% The normal setting for \cs{parfillskip} is |0pt plus 1fil|; the +% parameters are provided for testing combinations of % \cs{}\{|left|$\mid$|right|\}|skip| and \cs{parfillskip}. % % \DescribeMacro{\CenteringParindent} @@ -492,29 +497,29 @@ % This package has the following options: % \changes{v2.00}{2003/01/04}{Allow all-lowercase versions of % options and removed documentation of -% mixed-case versions.} +% mixed-case versions.} % \nopagebreak % \begin{description} % \item[\normalfont\option{originalcommands}] -% The \LaTeX-commands \cs{centering}, \cs{raggedleft}, and -% \cs{raggedright} and the \LaTeX-environments \env{center}, +% The \LaTeX-commands \cs{centering}, \cs{raggedleft}, and +% \cs{raggedright} and the \LaTeX-environments \env{center}, % \env{flushleft}, and \env{flushright} remain unchanged.\newline % It is the default. % \item[\normalfont\option{newcommands}] -% The \LaTeX-commands \cs{centering}, \cs{raggedleft}, and -% \cs{raggedright} and the \LaTeX-environments \env{center}, +% The \LaTeX-commands \cs{centering}, \cs{raggedleft}, and +% \cs{raggedright} and the \LaTeX-environments \env{center}, % \env{flushleft}, and \env{flushright} are set equal to their % counterparts defined by \package{ragged2e}. % Thus \cs{raggedright} invokes \cs{RaggedRight}. -% The original commands can be accessed unter the Names +% The original commands can be accessed unter the Names % \cs{LaTeX}\meta{original name}, e.\,g.\ \cs{LaTeXraggedright}. % \item[\normalfont\option{originalparameters}] -% The parameters used by the commands implemented by -% \package{ragged2e} are initialized with the default settings +% The parameters used by the commands implemented by +% \package{ragged2e} are initialized with the default settings % used by \LaTeX. % \item[\normalfont\option{newparameters}] -% The parameters used by the commands implemented by -% \package{ragged2e} are initialized with the default settings +% The parameters used by the commands implemented by +% \package{ragged2e} are initialized with the default settings % defined by \package{ragged2e}.\newline % It is the default. % \item[\normalfont\option{raggedrightboxes}] @@ -583,7 +588,7 @@ % (\url{rsieger@awi-bremerhaven.de}) this package might not % be.\newline % Markus Kohm (\url{markus.kohm@gmx.de}) provided the code for -% \cs{@gnewline}.\newline +% \cs{@gnewline}.\newline % Frank Mittelbach (\url{frank.mittelbach@latex-project.org}) % provided the impetus for version~2.00.\newline % Rolf Niepraschk (\url{Rolf.Niepraschk@gmx.de}) and Hubert Gäßlein @@ -661,7 +666,7 @@ % ^^A ----------------------------- % % \section{The implementation} -% \changes{v2.00}{2003/01/10}{Removed spaces and unneeded braces +% \changes{v2.00}{2003/01/10}{Removed spaces and unneeded braces % from \cs{setlength}; replaced % \texttt{plus} with \cs{@plus}} % \changes{v2.02}{2003/02/24}{Removed \cs{setlength}} @@ -677,7 +682,7 @@ % \subsection{Initial Code} % ^^A % \begin{macro}{\if@raggedtwoe@originalcommands} -% \cs{if@raggedtwoe@originalcommands} is used to flag the use of the +% \cs{if@raggedtwoe@originalcommands} is used to flag the use of the % \option{originalcommands} or \option{newcommands} option. % \begin{macrocode} \newif\if@raggedtwoe@originalcommands @@ -685,7 +690,7 @@ % \end{macro} % % \begin{macro}{\if@raggedtwoe@originalparameters} -% \cs{if@raggedtwoe@originalparameters} is used to flag the use of the +% \cs{if@raggedtwoe@originalparameters} is used to flag the use of the % \option{originalparameters} or \option{newparameters} option. % \begin{macrocode} \newif\if@raggedtwoe@originalparameters @@ -711,7 +716,7 @@ % % \subsubsection{\option{originalcommands} option} % ^^A -% The \option{originalcommands} and \option{newcommands} options +% The \option{originalcommands} and \option{newcommands} options % control the meaning of the \LaTeX-commands for ragged text: % If \option{newcommands} is used the \LaTeX-commands are set equal % to the commands defined by \package{ragged2e}. @@ -749,7 +754,7 @@ % \changes{v2.00}{2003/01/04}{New option \option{raggedrightboxes}}% % The option \option{raggedrightboxes} sets all % \cs{parbox}es, \env{minipage}s, \cs{marginpar}s and |p|-columns of -% \env{tabular}s and \env{array}s using \cs{RaggedRight}. +% \env{tabular}s and \env{array}s using \cs{RaggedRight}. % This is done by redefining \cs{@arrayparboxrestore}. % \begin{macro}{\@raggedtwoe@raggedrightboxes@opt} % \cs{@raggedtwoe@raggedrightboxes@opt} is the code executed via @@ -771,9 +776,9 @@ \parindent\z@ \parskip\z@skip \everypar{}% \linewidth\hsize - \@totalleftmargin\z@ + \@totalleftmargin\z@ \leftskip\z@skip \rightskip\z@skip \@rightskip\z@skip - \parfillskip\@flushglue + \parfillskip\@flushglue \lineskip\normallineskip \lineskiplimit\normallineskiplimit \baselineskip\normalbaselineskip @@ -794,7 +799,7 @@ \parskip\z@skip \everypar{}% \linewidth\hsize - \@totalleftmargin\z@ + \@totalleftmargin\z@ \RaggedRight \lineskip\normallineskip \baselineskip\normalbaselineskip @@ -908,7 +913,7 @@ % % \subsection{Executing options} % ^^A -% The default options are \option{originalcommands} and +% The default options are \option{originalcommands} and % \option{newparameters}. % \begin{macrocode} \ExecuteOptions{originalcommands,newparameters} @@ -1043,7 +1048,7 @@ % % \subsection{Distinguishing between monospaced and proportional fonts} % ^^A -% To set ragged text with proportional fonts \emph{and} monospaced +% To set ragged text with proportional fonts \emph{and} monospaced % fonts correctly, we must distinguish between these two kinds of % fonts \emph{everytime} a font is loaded. % Otherwise the settings for e.\,g.\ a proportional fonts would be @@ -1059,14 +1064,14 @@ % We do the setting with the help of \package{everysel}\,\cite{everysel}, % which allows us to define code which is (hopefully) executed after % every fontchange in a \LaTeX{} document.\footnote{^^A -% It \emph{is} executed after every \cs{selectfont}, so if you stay -% within NFSS and don't declare your fonts with commands like +% It \emph{is} executed after every \cs{selectfont}, so if you stay +% within NFSS and don't declare your fonts with commands like % \cs{newfont} and then switch to them, it will work.} % % \begin{macro}{\if@raggedtwoe@spaceskip} % \cs{if@raggedtwoe@spaceskip} signals the use of commands defined by % \package{ragged2e} to the command inserted into \cs{selectfont}. -% It is set to true by these commands and restored to false by \TeX{} +% It is set to true by these commands and restored to false by \TeX{} % when the scope of them ends. % \begin{macrocode} \newif\if@raggedtwoe@spaceskip @@ -1074,7 +1079,7 @@ % \end{macro} % % \begin{macro}{\@raggedtwoe@everyselectfont} -% \cs{@raggedtwoe@everyselectfont} is our code inserted into +% \cs{@raggedtwoe@everyselectfont} is our code inserted into % \cs{selectfont}. % \changes{v2.00}{2003/01/26}{Completely redesigned and removed % \cs{RaggedSpaceskip} and @@ -1099,7 +1104,7 @@ \else % \end{macrocode} % For proportional fonts we make the interword space rigid by setting -% \cs{spaceskip} to \cs{fontdimen2}. +% \cs{spaceskip} to \cs{fontdimen2}. % \begin{macrocode} \spaceskip\fontdimen\tw@\font \fi @@ -1115,11 +1120,18 @@ % \end{macrocode} % If our kernel is new enough we use the kernel hook directly instead of the everysel macro. % \changes{v3.00}{2021/02/05}{Use kernel hook if available} +% \changes{v3.3}{2023/02/22}{Apply hook only when a ragged2e command is active.} % \begin{macrocode} +\newif\if@raggedtwoe@localhook \IfFormatAtLeastTF{2021/01/05} - {\AddToHook{selectfont}{\@raggedtwoe@everyselectfont}} + {\@raggedtwoe@localhooktrue} {\EverySelectfont{\@raggedtwoe@everyselectfont}} % \end{macrocode} +% We define a command to only add the local hook with the ragged2e commands. +% This will keep the impact local. +% \begin{macrocode} +\newcommand*{\@raggedtwoe@addlocalhook}{} +% \end{macrocode} % \end{macro} % % @@ -1137,7 +1149,7 @@ % % \begin{macro}{\@raggedtwoe@saved@gnewline} % \changes{v2.00}{2003/01/04}{New macro} -% We save the definition of \cs{@gnewline} in +% We save the definition of \cs{@gnewline} in % \cs{@raggedtwoe@saved@gnewline}. % \begin{macrocode} \let\@raggedtwoe@saved@gnewline\@gnewline @@ -1168,7 +1180,7 @@ % \begin{macrocode} \newcommand*{\@raggedtwoe@gnewline}[1]{% \ifvmode - \@nolnerr + \@nolnerr \else \unskip \ifmmode @@ -1207,6 +1219,9 @@ % and switch \cs{@gnewline}} % \begin{macrocode} \DeclareRobustCommand{\Centering}{% + \if@raggedtwoe@localhook + \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont} + \fi \ifx\\\@raggedtwoe@savedcr \let\\\@raggedtwoe@centercrNoindent \fi @@ -1230,6 +1245,9 @@ % and switch \cs{@gnewline}} % \begin{macrocode} \DeclareRobustCommand{\RaggedLeft}{% + \if@raggedtwoe@localhook + \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont} + \fi \ifx\\\@raggedtwoe@savedcr \let\\\@raggedtwoe@centercrNoindent \fi @@ -1253,6 +1271,9 @@ % and switch \cs{@gnewline}} % \begin{macrocode} \DeclareRobustCommand{\RaggedRight}{% + \if@raggedtwoe@localhook + \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont} + \fi \ifx\\\@raggedtwoe@savedcr \let\\\@raggedtwoe@centercrNoindent \fi @@ -1275,6 +1296,9 @@ % \changes{v2.00}{2003/01/04}{New macro} % \begin{macrocode} \DeclareRobustCommand{\justifying}{% + \if@raggedtwoe@localhook + \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont} + \fi \let\\\@raggedtwoe@savedcr \let\@gnewline\@raggedtwoe@saved@gnewline \leftskip\z@ @@ -1297,7 +1321,7 @@ % \begin{environment}{FlushLeft} % \begin{environment}{FlushRight} % The environments \env{Center}, \env{FlushLeft}, and \cs{FlushRight} -% are implemented like their counterparts in \LaTeX: Start a +% are implemented like their counterparts in \LaTeX: Start a % \env{trivlist} and switch on the right command. % \changes{v2.02}{2003/02/24}{Use \cs{trivlist} \ldots{} % \cs{endtrivlist} instead of @@ -1327,7 +1351,7 @@ % \end{environment} % \end{environment} % \begin{environment}{justify} -% \env{justify} is similar to the other environments: Start a +% \env{justify} is similar to the other environments: Start a % \env{trivlist} and use \cs{justifying}. % \changes{v2.00}{2003/01/04}{New environment} % \changes{v2.02}{2003/02/24}{Use \cs{trivlist} \ldots{} @@ -1349,7 +1373,7 @@ % % \subsection{Overloading the \LaTeX-commands} % ^^A -% If the option \option{newcommands} is used, we save the original +% If the option \option{newcommands} is used, we save the original % \LaTeX-commands and environments for ragged text and overload them. % \changes{v2.04}{2003/03/02}{Save more commands} % \changes{v2.1}{2003/10/08}{bugfix: \cs{Flushleft} instead of @@ -1364,13 +1388,13 @@ \let\raggedleft\RaggedLeft \let\raggedright\RaggedRight \let\LaTeXcenter\center - \let\endLaTeXcenter\endcenter + \let\endLaTeXcenter\endcenter \let\LaTeXflushleft\flushleft \let\endLaTeXflushleft\endflushleft \let\LaTeXflushright\flushright \let\endLaTeXflushright\endflushright \let\center\Center - \let\endcenter\endCenter + \let\endcenter\endCenter \let\flushleft\FlushLeft \let\endflushleft\endFlushLeft \let\flushright\FlushRight diff --git a/macros/latex/contrib/ragged2e/ragged2e.ins b/macros/latex/contrib/ragged2e/ragged2e.ins index 1b4945c821..81513b5209 100644 --- a/macros/latex/contrib/ragged2e/ragged2e.ins +++ b/macros/latex/contrib/ragged2e/ragged2e.ins @@ -1,7 +1,7 @@ \input docstrip.tex \preamble -Copyright (C) 1996–2019 Martin Schröder, 2021–2022 Marei Peischl (peiTeX) <marei@peitex.de> +Copyright (C) 1996–2019 Martin Schröder, 2021–2023 Marei Peischl (peiTeX) <marei@peitex.de> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c diff --git a/macros/latex/contrib/ragged2e/ragged2e.pdf b/macros/latex/contrib/ragged2e/ragged2e.pdf Binary files differindex 6d462050b9..042265ba49 100644 --- a/macros/latex/contrib/ragged2e/ragged2e.pdf +++ b/macros/latex/contrib/ragged2e/ragged2e.pdf |