diff options
author | Robert Alessi <alessi@robertalessi.net> | 2018-10-04 17:18:54 +0200 |
---|---|---|
committer | Robert Alessi <alessi@robertalessi.net> | 2018-10-04 17:18:54 +0200 |
commit | 639318d6e7443445fe3f9ffdeae3ff73b1266c94 (patch) | |
tree | dc95e53a5da9f790ec76b7bc22c860e64b9fd477 | |
parent | e0fff70aec7a11ad6d7a3f1d22bd52dad5b7a0bf (diff) | |
download | courses-639318d6e7443445fe3f9ffdeae3ff73b1266c94.tar.gz |
new biblatex engine
-rw-r--r-- | _preamble.tex | 2 | ||||
-rw-r--r-- | _preamble_bbl.tex | 140 | ||||
-rw-r--r-- | fichiers/01-ligne-de-commande.tex | 2 | ||||
-rw-r--r-- | fichiers/02-git.tex | 18 | ||||
-rw-r--r-- | fichiers/images/02-gitk.png | bin | 0 -> 81775 bytes |
5 files changed, 137 insertions, 25 deletions
diff --git a/_preamble.tex b/_preamble.tex index cd594b5..4e1fd03 100644 --- a/_preamble.tex +++ b/_preamble.tex | |||
@@ -2,7 +2,7 @@ | |||
2 | \usepackage[french]{babel} | 2 | \usepackage[french]{babel} |
3 | 3 | ||
4 | \usepackage{fontspec} | 4 | \usepackage{fontspec} |
5 | \setmainfont{Old Standard} | 5 | % \setmainfont{Old Standard} |
6 | \addtokomafont{disposition}{\rmfamily} | 6 | \addtokomafont{disposition}{\rmfamily} |
7 | 7 | ||
8 | \usepackage{csquotes} | 8 | \usepackage{csquotes} |
diff --git a/_preamble_bbl.tex b/_preamble_bbl.tex index 383f396..c0e41fa 100644 --- a/_preamble_bbl.tex +++ b/_preamble_bbl.tex | |||
@@ -1,21 +1,121 @@ | |||
1 | \usepackage[style=footnote-dw, xref=true, loccittracker, opcittracker, | 1 | % biblatex-dw: |
2 | autopunct=false, ibidemfont=italic, idemfont=italic, | 2 | % \usepackage[style=footnote-dw, xref=true, loccittracker, opcittracker, |
3 | citeauthorname=firstfull, idembibformat=dash, nopublisher=false, | 3 | % autopunct=false, ibidemfont=italic, idemfont=italic, |
4 | annotation=true, pageref=true, journalnumber=date, | 4 | % citeauthorname=firstfull, idembibformat=dash, nopublisher=false, |
5 | acronyms=true]{biblatex} | 5 | % annotation=true, pageref=true, journalnumber=date, |
6 | 6 | % acronyms=true]{biblatex} | |
7 | \DefineBibliographyExtras{french}{% | 7 | |
8 | \renewcommand{\mkbibnamefamily}[1]{#1}% | 8 | % \renewcommand{\mkbibacro}[1]{% |
9 | } | 9 | % \textls[55]{\scalefont{0.95}#1}\isdot} |
10 | \renewcommand{\mkbibacro}[1]{% | 10 | % \renewcommand{\labelnamepunct}{\addperiod\space} |
11 | \textls[55]{\scalefont{0.95}#1}\isdot} | 11 | % \DeclareLanguageMapping{french}{french-dw} |
12 | \renewcommand{\labelnamepunct}{\addperiod\space} | 12 | % \DeclareFieldFormat[book]{title}{\mkbibemph{#1}} |
13 | \DeclareLanguageMapping{french}{french-dw} | 13 | % \DeclareFieldFormat[book]{citetitle}{\mkbibemph{#1}} |
14 | \DeclareFieldFormat[book]{title}{\mkbibemph{#1}} | 14 | % \DeclareFieldFormat[article]{title}{\mkbibquote{#1}} |
15 | \DeclareFieldFormat[book]{citetitle}{\mkbibemph{#1}} | 15 | % \DeclareFieldFormat[article]{citetitle}{\mkbibquote{#1}} |
16 | \DeclareFieldFormat[article]{title}{\mkbibquote{#1}} | 16 | % \DeclareFieldFormat[inreference]{citetitle}{\mkbibquote{#1}} |
17 | \DeclareFieldFormat[article]{citetitle}{\mkbibquote{#1}} | 17 | % \DeclareFieldFormat{journaltitle}{\mkbibemph{#1}} |
18 | \DeclareFieldFormat[inreference]{citetitle}{\mkbibquote{#1}} | 18 | % \DeclareFieldFormat{citejournaltitle}{\mkbibemph{#1}} |
19 | \DeclareFieldFormat{journaltitle}{\mkbibemph{#1}} | 19 | |
20 | \DeclareFieldFormat{citejournaltitle}{\mkbibemph{#1}} | 20 | \usepackage[style=ext-verbose-inote]{biblatex} |
21 | |||
22 | % \DefineBibliographyExtras{french}{% | ||
23 | % \renewcommand{\mkbibnamefamily}[1]{#1}% | ||
24 | % } | ||
25 | |||
21 | \addbibresource{../bibliography.bib} | 26 | \addbibresource{../bibliography.bib} |
27 | |||
28 | % Automatically cite authors in full at first, then only by last | ||
29 | % name. See https://tex.stackexchange.com/a/314708 | ||
30 | \makeatletter | ||
31 | \newrobustcmd*{\cbx@nametracker@global}[1]{% | ||
32 | \xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection} | ||
33 | {} | ||
34 | {\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}} | ||
35 | |||
36 | \newrobustcmd*{\cbx@nametracker@context}[1]{% | ||
37 | \iftoggle{blx@footnote} | ||
38 | {\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection} | ||
39 | {} | ||
40 | {\listcsxadd{cbx@fseen@names@\the\c@refsection}{#1}}} | ||
41 | {\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection} | ||
42 | {} | ||
43 | {\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}}} | ||
44 | |||
45 | \newrobustcmd*{\cbx@ifnameseen@global}[1]{% | ||
46 | \xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}} | ||
47 | |||
48 | \newrobustcmd*{\cbx@ifnameseen@context}[1]{% | ||
49 | \iftoggle{blx@footnote}% | ||
50 | {\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection}}% | ||
51 | {\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}}} | ||
52 | |||
53 | \DeclareBibliographyOption[string]{nametracker}[true]{% | ||
54 | \ifcsdef{blx@opt@nametracker@#1} | ||
55 | {\csuse{blx@opt@nametracker@#1}} | ||
56 | {\blx@err@invopt{nametracker=#1}{}}} | ||
57 | |||
58 | \def\blx@opt@nametracker@global{% | ||
59 | \let\cbx@ifnameseen\cbx@ifnameseen@global | ||
60 | \let\cbx@nametracker\cbx@nametracker@global} | ||
61 | |||
62 | \let\blx@opt@nametracker@true\blx@opt@nametracker@global | ||
63 | |||
64 | \def\blx@opt@nametracker@false{% | ||
65 | \protected\long\def\cbx@ifnameseen##1##2##3{##3}% | ||
66 | \let\cbx@nametracker\relax} | ||
67 | |||
68 | \def\blx@opt@nametracker@context{% | ||
69 | \let\cbx@ifnameseen\cbx@ifnameseen@context | ||
70 | \let\cbx@nametracker\cbx@nametracker@context} | ||
71 | |||
72 | \appto\blx@secinit{% | ||
73 | \ifcsundef{cbx@bseen@names@\the\c@refsection} | ||
74 | {\global\cslet{cbx@bseen@names@\the\c@refsection}\@empty} | ||
75 | {}% | ||
76 | \ifcsundef{cbx@fseen@names@\the\c@refsection} | ||
77 | {\global\cslet{cbx@fseen@names@\the\c@refsection}\@empty} | ||
78 | {}} | ||
79 | |||
80 | \InitializeCitationStyle{% | ||
81 | \global\cslet{cbx@bseen@names@\the\c@refsection}\@empty | ||
82 | \global\cslet{cbx@fseen@names@\the\c@refsection}\@empty} | ||
83 | |||
84 | \ExecuteBibliographyOptions{nametracker=context} | ||
85 | |||
86 | \DeclareNameFormat{labelname}{% | ||
87 | \cbx@ifnameseen{\thefield{hash}} | ||
88 | {\ifcase\value{uniquename}% | ||
89 | \usebibmacro{name:family} | ||
90 | {\namepartfamily} | ||
91 | {\namepartgiven} | ||
92 | {\namepartprefix} | ||
93 | {\namepartsuffix}% | ||
94 | \or | ||
95 | \ifuseprefix | ||
96 | {\usebibmacro{name:given-family} | ||
97 | {\namepartfamily} | ||
98 | {\namepartgiveni} | ||
99 | {\namepartprefix} | ||
100 | {\namepartsuffixi}} | ||
101 | {\usebibmacro{name:given-family} | ||
102 | {\namepartfamily} | ||
103 | {\namepartgiveni} | ||
104 | {\namepartprefixi} | ||
105 | {\namepartsuffixi}}% | ||
106 | \or | ||
107 | \usebibmacro{name:given-family} | ||
108 | {\namepartfamily} | ||
109 | {\namepartgiven} | ||
110 | {\namepartprefix} | ||
111 | {\namepartsuffix}% | ||
112 | \fi} | ||
113 | {\usebibmacro{name:given-family} | ||
114 | {\namepartfamily} | ||
115 | {\namepartgiven} | ||
116 | {\namepartprefix} | ||
117 | {\namepartsuffix}% | ||
118 | \cbx@nametracker{\thefield{hash}}} | ||
119 | \usebibmacro{name:andothers}} | ||
120 | \makeatother | ||
121 | |||
diff --git a/fichiers/01-ligne-de-commande.tex b/fichiers/01-ligne-de-commande.tex index edc3765..226dc0e 100644 --- a/fichiers/01-ligne-de-commande.tex +++ b/fichiers/01-ligne-de-commande.tex | |||
@@ -606,7 +606,7 @@ possibles: | |||
606 | \verb+photos_de_vacances.zip+ | 606 | \verb+photos_de_vacances.zip+ |
607 | \end{quoting} | 607 | \end{quoting} |
608 | 608 | ||
609 | \paragraph{\hypertarget{lnk_hidden}{Fichiers cachés}} | 609 | \paragraph[Fichiers cachés]{\hypertarget{lnk_hidden}{Fichiers cachés}} |
610 | Tout fichier dont le nom commence par un point (\mintinline{text}|.|) | 610 | Tout fichier dont le nom commence par un point (\mintinline{text}|.|) |
611 | est considéré comme un fichier caché. Le plus souvent, les fichiers | 611 | est considéré comme un fichier caché. Le plus souvent, les fichiers |
612 | cachés contiennent des paramètres de configuration. La commande | 612 | cachés contiennent des paramètres de configuration. La commande |
diff --git a/fichiers/02-git.tex b/fichiers/02-git.tex index a314c80..f27b574 100644 --- a/fichiers/02-git.tex +++ b/fichiers/02-git.tex | |||
@@ -29,11 +29,16 @@ | |||
29 | \inputminted[#1]{#2}{scripts/#3} | 29 | \inputminted[#1]{#2}{scripts/#3} |
30 | } | 30 | } |
31 | 31 | ||
32 | \usepackage{rotfloat} | ||
33 | \usepackage{adjustbox} | ||
34 | |||
32 | \begin{document} | 35 | \begin{document} |
33 | \maketitle | 36 | \maketitle |
34 | \renewcommand{\contentsname}{Sommaire} | 37 | \renewcommand{\contentsname}{Sommaire} |
35 | \tableofcontents | 38 | \tableofcontents |
36 | 39 | ||
40 | \listoffigures | ||
41 | |||
37 | % \listoflistings | 42 | % \listoflistings |
38 | 43 | ||
39 | % \needspace{3\baselineskip} | 44 | % \needspace{3\baselineskip} |
@@ -45,9 +50,9 @@ | |||
45 | \paragraph{Avertissement} | 50 | \paragraph{Avertissement} |
46 | Dans les pages qui suivent, on cherche à donner au lecteur quelques | 51 | Dans les pages qui suivent, on cherche à donner au lecteur quelques |
47 | éléments sur la notion de \emph{système de contrôle de version} en | 52 | éléments sur la notion de \emph{système de contrôle de version} en |
48 | général et sur \emph{Git} en particulier. L'ouvrage de référence, | 53 | général et sur \emph{Git} en particulier. L'ouvrage de référence, par |
49 | \citetitle{Chacon.Straub2018}, traduit en français, est disponible en | 54 | \citeauthor{Chacon.Straub2018}, \citetitle{Chacon.Straub2018}, traduit |
50 | ligne\autocite{Chacon.Straub2018}. | 55 | en français, est disponible en ligne\autocite{Chacon.Straub2018}. |
51 | 56 | ||
52 | \section{Les systèmes de contrôle de version} | 57 | \section{Les systèmes de contrôle de version} |
53 | \label{sec:vers-contr-syst} | 58 | \label{sec:vers-contr-syst} |
@@ -386,6 +391,13 @@ séquence de~40 caractères allant de \verb|0| à \verb|9| et de \verb|a| | |||
386 | \item \verb|git log| $\rightarrow$ affiche le journal de Git. | 391 | \item \verb|git log| $\rightarrow$ affiche le journal de Git. |
387 | \end{enumerate} | 392 | \end{enumerate} |
388 | 393 | ||
394 | \begin{sidewaysfigure} | ||
395 | \centering \adjustimage{frame,width=\linewidth}{images/02-gitk.png} | ||
396 | \caption{gitk} | ||
397 | \label{fig:houba} | ||
398 | \end{sidewaysfigure} | ||
399 | |||
400 | |||
389 | \hfill\verb|../.. à suivre| | 401 | \hfill\verb|../.. à suivre| |
390 | 402 | ||
391 | \end{document} | 403 | \end{document} |
diff --git a/fichiers/images/02-gitk.png b/fichiers/images/02-gitk.png new file mode 100644 index 0000000..cc9c455 --- /dev/null +++ b/fichiers/images/02-gitk.png | |||
Binary files differ | |||