From 639318d6e7443445fe3f9ffdeae3ff73b1266c94 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Thu, 4 Oct 2018 17:18:54 +0200 Subject: new biblatex engine --- _preamble.tex | 2 +- _preamble_bbl.tex | 140 ++++++++++++++++++++++++++++++++------ fichiers/01-ligne-de-commande.tex | 2 +- fichiers/02-git.tex | 18 ++++- fichiers/images/02-gitk.png | Bin 0 -> 81775 bytes 5 files changed, 137 insertions(+), 25 deletions(-) create mode 100644 fichiers/images/02-gitk.png diff --git a/_preamble.tex b/_preamble.tex index cd594b5..4e1fd03 100644 --- a/_preamble.tex +++ b/_preamble.tex @@ -2,7 +2,7 @@ \usepackage[french]{babel} \usepackage{fontspec} -\setmainfont{Old Standard} +% \setmainfont{Old Standard} \addtokomafont{disposition}{\rmfamily} \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 @@ -\usepackage[style=footnote-dw, xref=true, loccittracker, opcittracker, -autopunct=false, ibidemfont=italic, idemfont=italic, -citeauthorname=firstfull, idembibformat=dash, nopublisher=false, -annotation=true, pageref=true, journalnumber=date, -acronyms=true]{biblatex} - -\DefineBibliographyExtras{french}{% - \renewcommand{\mkbibnamefamily}[1]{#1}% -} -\renewcommand{\mkbibacro}[1]{% - \textls[55]{\scalefont{0.95}#1}\isdot} -\renewcommand{\labelnamepunct}{\addperiod\space} -\DeclareLanguageMapping{french}{french-dw} -\DeclareFieldFormat[book]{title}{\mkbibemph{#1}} -\DeclareFieldFormat[book]{citetitle}{\mkbibemph{#1}} -\DeclareFieldFormat[article]{title}{\mkbibquote{#1}} -\DeclareFieldFormat[article]{citetitle}{\mkbibquote{#1}} -\DeclareFieldFormat[inreference]{citetitle}{\mkbibquote{#1}} -\DeclareFieldFormat{journaltitle}{\mkbibemph{#1}} -\DeclareFieldFormat{citejournaltitle}{\mkbibemph{#1}} +% biblatex-dw: +% \usepackage[style=footnote-dw, xref=true, loccittracker, opcittracker, +% autopunct=false, ibidemfont=italic, idemfont=italic, +% citeauthorname=firstfull, idembibformat=dash, nopublisher=false, +% annotation=true, pageref=true, journalnumber=date, +% acronyms=true]{biblatex} + +% \renewcommand{\mkbibacro}[1]{% +% \textls[55]{\scalefont{0.95}#1}\isdot} +% \renewcommand{\labelnamepunct}{\addperiod\space} +% \DeclareLanguageMapping{french}{french-dw} +% \DeclareFieldFormat[book]{title}{\mkbibemph{#1}} +% \DeclareFieldFormat[book]{citetitle}{\mkbibemph{#1}} +% \DeclareFieldFormat[article]{title}{\mkbibquote{#1}} +% \DeclareFieldFormat[article]{citetitle}{\mkbibquote{#1}} +% \DeclareFieldFormat[inreference]{citetitle}{\mkbibquote{#1}} +% \DeclareFieldFormat{journaltitle}{\mkbibemph{#1}} +% \DeclareFieldFormat{citejournaltitle}{\mkbibemph{#1}} + +\usepackage[style=ext-verbose-inote]{biblatex} + +% \DefineBibliographyExtras{french}{% +% \renewcommand{\mkbibnamefamily}[1]{#1}% +% } + \addbibresource{../bibliography.bib} + +% Automatically cite authors in full at first, then only by last +% name. See https://tex.stackexchange.com/a/314708 +\makeatletter +\newrobustcmd*{\cbx@nametracker@global}[1]{% + \xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection} + {} + {\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}} + +\newrobustcmd*{\cbx@nametracker@context}[1]{% + \iftoggle{blx@footnote} + {\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection} + {} + {\listcsxadd{cbx@fseen@names@\the\c@refsection}{#1}}} + {\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection} + {} + {\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}}} + +\newrobustcmd*{\cbx@ifnameseen@global}[1]{% + \xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}} + +\newrobustcmd*{\cbx@ifnameseen@context}[1]{% + \iftoggle{blx@footnote}% + {\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection}}% + {\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}}} + +\DeclareBibliographyOption[string]{nametracker}[true]{% + \ifcsdef{blx@opt@nametracker@#1} + {\csuse{blx@opt@nametracker@#1}} + {\blx@err@invopt{nametracker=#1}{}}} + +\def\blx@opt@nametracker@global{% + \let\cbx@ifnameseen\cbx@ifnameseen@global + \let\cbx@nametracker\cbx@nametracker@global} + +\let\blx@opt@nametracker@true\blx@opt@nametracker@global + +\def\blx@opt@nametracker@false{% + \protected\long\def\cbx@ifnameseen##1##2##3{##3}% + \let\cbx@nametracker\relax} + +\def\blx@opt@nametracker@context{% + \let\cbx@ifnameseen\cbx@ifnameseen@context + \let\cbx@nametracker\cbx@nametracker@context} + +\appto\blx@secinit{% + \ifcsundef{cbx@bseen@names@\the\c@refsection} + {\global\cslet{cbx@bseen@names@\the\c@refsection}\@empty} + {}% + \ifcsundef{cbx@fseen@names@\the\c@refsection} + {\global\cslet{cbx@fseen@names@\the\c@refsection}\@empty} + {}} + +\InitializeCitationStyle{% + \global\cslet{cbx@bseen@names@\the\c@refsection}\@empty + \global\cslet{cbx@fseen@names@\the\c@refsection}\@empty} + +\ExecuteBibliographyOptions{nametracker=context} + +\DeclareNameFormat{labelname}{% + \cbx@ifnameseen{\thefield{hash}} + {\ifcase\value{uniquename}% + \usebibmacro{name:family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \or + \ifuseprefix + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffixi}} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefixi} + {\namepartsuffixi}}% + \or + \usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \fi} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \cbx@nametracker{\thefield{hash}}} + \usebibmacro{name:andothers}} +\makeatother + 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: \verb+photos_de_vacances.zip+ \end{quoting} -\paragraph{\hypertarget{lnk_hidden}{Fichiers cachés}} +\paragraph[Fichiers cachés]{\hypertarget{lnk_hidden}{Fichiers cachés}} Tout fichier dont le nom commence par un point (\mintinline{text}|.|) est considéré comme un fichier caché. Le plus souvent, les fichiers 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 @@ \inputminted[#1]{#2}{scripts/#3} } +\usepackage{rotfloat} +\usepackage{adjustbox} + \begin{document} \maketitle \renewcommand{\contentsname}{Sommaire} \tableofcontents +\listoffigures + % \listoflistings % \needspace{3\baselineskip} @@ -45,9 +50,9 @@ \paragraph{Avertissement} Dans les pages qui suivent, on cherche à donner au lecteur quelques éléments sur la notion de \emph{système de contrôle de version} en -général et sur \emph{Git} en particulier. L'ouvrage de référence, -\citetitle{Chacon.Straub2018}, traduit en français, est disponible en -ligne\autocite{Chacon.Straub2018}. +général et sur \emph{Git} en particulier. L'ouvrage de référence, par +\citeauthor{Chacon.Straub2018}, \citetitle{Chacon.Straub2018}, traduit +en français, est disponible en ligne\autocite{Chacon.Straub2018}. \section{Les systèmes de contrôle de version} \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| \item \verb|git log| $\rightarrow$ affiche le journal de Git. \end{enumerate} +\begin{sidewaysfigure} + \centering \adjustimage{frame,width=\linewidth}{images/02-gitk.png} + \caption{gitk} + \label{fig:houba} +\end{sidewaysfigure} + + \hfill\verb|../.. à suivre| \end{document} diff --git a/fichiers/images/02-gitk.png b/fichiers/images/02-gitk.png new file mode 100644 index 0000000..cc9c455 Binary files /dev/null and b/fichiers/images/02-gitk.png differ -- cgit v1.2.3