Skip to content

Commit 5ee5502

Browse files
authored
Merge branch 'master' into fix-natorf
2 parents e92f4a2 + 814173a commit 5ee5502

File tree

3 files changed

+33
-23
lines changed

3 files changed

+33
-23
lines changed

.github/workflows/CI.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
should_skip: ${{ steps.skip_check.outputs.should_skip }}
2020
steps:
2121
- id: skip_check
22-
uses: fkirc/skip-duplicate-actions@v4
22+
uses: fkirc/skip-duplicate-actions@v5
2323
with:
2424
cancel_others: 'true'
2525
paths: '["src/**", "Makefile", "fixdate.pl"]'
2626

2727
check:
2828
name: Check LaTeX
2929
needs: skip_check
30-
if: ${{ needs.skip_check.outputs.should_skip != 'true' }}
30+
if: ${{ needs.skip_check.outputs.should_skip != true }}
3131
runs-on: ubuntu-latest
3232
container: ghcr.io/xu-cheng/texlive-small:latest
3333

@@ -40,7 +40,7 @@ jobs:
4040
tlmgr install latexindent
4141
4242
- name: Checkout the repository
43-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4444

4545
- name: Run ChkTeX
4646
run: |
@@ -56,7 +56,7 @@ jobs:
5656
build_latex:
5757
name: Build LaTeX
5858
needs: skip_check
59-
if: ${{ needs.skip_check.outputs.should_skip != 'true' }}
59+
if: ${{ needs.skip_check.outputs.should_skip != true }}
6060
runs-on: ubuntu-latest
6161
container: ghcr.io/xu-cheng/texlive-full:latest
6262

@@ -70,7 +70,7 @@ jobs:
7070
apk add py3-pygments
7171
7272
- name: Checkout the repository
73-
uses: actions/checkout@v3
73+
uses: actions/checkout@v4
7474
with:
7575
submodules: recursive
7676

src/basics.tex

+8-8
Original file line numberDiff line numberDiff line change
@@ -689,33 +689,33 @@ \section{Packages}\index{package} While writing your document, you will
689689
\caption{Examples of \LaTeX{} packages.}\label{packages}
690690
\begin{tabular}{@{}lp{9cm}@{}}
691691
\toprule
692-
Package & Description \\
692+
Package & Description \\
693693
\midrule
694694
\pai*{amsmath} & Provides additional commands for typesetting
695695
mathematical symbols, and environments for aligning equations. Described
696-
in \autoref{chap:math}. \\
696+
in \autoref{chap:math}. \\
697697

698698
\pai*{polyglossia} & Makes it easy to write \LaTeX{} documents in
699699
languages other than English, or even in multiple languages.
700-
Described in \autoref{sec:polyglossia}. \\
700+
Described in \autoref{sec:polyglossia}. \\
701701

702702
\pai*{booktabs} & Provides commands for producing beautifully
703703
formatted tables for your document. Described in
704-
\autoref{sec:tables}. \\
704+
\autoref{sec:tables}. \\
705705

706706
\pai*{biblatex} & Provides commands for automatically specifying and
707707
producing a bibliography for your document. Described in
708-
\autoref{chap:bibliography}. \\
708+
\autoref{chap:bibliography}. \\
709709

710710
\pai*{makeidx} & Provides commands for producing indexes. Described
711-
in \autoref{sec:indexing}. \\
711+
in \autoref{sec:indexing}. \\
712712

713713
\pai*{fancyhdr} & Lets you easily customise page headers and footers.
714-
Described in \autoref{sec:fancy}. \\
714+
Described in \autoref{sec:fancy}. \\
715715

716716
\pai*{beamer} & Provides a document class that changes output to
717717
produce presentations and provides command to typeset slides.
718-
Described in \autoref{sec:beamer}. \\
718+
Described in \autoref{sec:beamer}. \\
719719
\bottomrule
720720
\end{tabular}
721721
\end{table}

src/bibliography.tex

+20-10
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,9 @@ \subsection{Citing commands}
479479
\end{example}
480480

481481
Another set of commands allows us to extract specific information from
482-
the bibliographic entry, and use the information directly in the text. This is includes commands such as \csi{citeauthor},
483-
\csi{citetitle}, \csi{citeyear}, \csi{citedate}, \csi{citeurl}.
482+
the bibliographic entry, and use the information directly in the text. This
483+
includes commands such as \csi{citeauthor}, \csi{citetitle}, \csi{citeyear},
484+
\csi{citedate}, \csi{citeurl}.
484485

485486
\begin{example}[standalone,
486487
biber,
@@ -553,20 +554,28 @@ \subsection{Citing commands}
553554

554555
\subsection{More about entries}
555556

556-
\hologo{biber} uses ``and'' as a separator in author entries. To prevent
557-
this behaviour, enclose ``and'' in curly brackets
557+
\hologo{biber} uses \enquote{and} as a separator in certain entries. To prevent
558+
this behaviour, enclose \enquote{and} in curly brackets
558559
\begin{minted}{bibtex}
559560
@book{kru,
560-
author = {Kruger {and} sons}
561+
publisher = {Kruger {and} sons}
561562
}
562563
\end{minted}
563564
The same trick may be useful when \hologo{biber} changes capitalisation, even
564-
though it shouldn't.
565+
though it shouldn't. On top of this \hologo{biber} splits author entries into
566+
smaller bits which are then used elsewhere. So in \autoref{lst:bibfile} the
567+
name Jane Diviner is split into the first name Jane and the surname Diviner.
568+
When you don't want this, enclose the entire name in braces
569+
\begin{minted}{bibtex}
570+
@book{kru,
571+
author = {{Kruger brothers}}
572+
}
573+
\end{minted}
565574

566575
When writing about certain subject it often happens that the same author or
567576
publishing company released several books. In order to reuse the information in
568-
several entries in the \eei{.bib} file, a special entry \cargv{xdata} is available. It may be used
569-
like this
577+
several entries in the \eei{.bib} file, a special entry \cargv{xdata} is
578+
available. It may be used like this
570579

571580
\begin{example}[standalone,
572581
biber,
@@ -578,8 +587,8 @@ \subsection{More about entries}
578587
\begin{filecontents}{example2.bib}
579588
%!hideend
580589
@xdata{krugers,
581-
author = {Kruger {and} sons},
582-
publisher = {Krugers Inc.},
590+
author = {{Kruger brothers}},
591+
publisher = {Kruger {and} sons},
583592
location = {Paris}
584593
}
585594

@@ -604,3 +613,4 @@ \subsection{More about entries}
604613
\printbibliography
605614
\end{document}
606615
\end{example}
616+

0 commit comments

Comments
 (0)