From e7c5d7a3a5770cb517f091e28e6ed9aa69bb4efa Mon Sep 17 00:00:00 2001 From: Yann Salmon Date: Sun, 24 Feb 2019 14:23:28 +0100 Subject: [PATCH] fin de import --- latex/inputDS.sty | 5 ++ latex/inputDS.tex | 3 - latex/{inputTD.tex => inputTD.sty} | 12 ++-- latex/{paquets.tex => paquets.sty} | 74 ++++++++++++------------ latex/{ysbeamer.tex => ysbeamer.sty} | 9 +-- latex/{texmf => }/ysbeamerarticle.cls | 0 latex/{yslistings.tex => yslistings.sty} | 9 +-- latex/{yssymbols.tex => yssymbols.sty} | 3 +- latex/{ystheorem.tex => ystheorem.sty} | 5 +- latex/{ystikz.tex => ystikz.sty} | 12 ++-- latex/{unicode.tex => ysunicode.sty} | 6 +- 11 files changed, 75 insertions(+), 63 deletions(-) create mode 100644 latex/inputDS.sty delete mode 100644 latex/inputDS.tex rename latex/{inputTD.tex => inputTD.sty} (95%) rename latex/{paquets.tex => paquets.sty} (74%) rename latex/{ysbeamer.tex => ysbeamer.sty} (95%) rename latex/{texmf => }/ysbeamerarticle.cls (100%) rename latex/{yslistings.tex => yslistings.sty} (96%) rename latex/{yssymbols.tex => yssymbols.sty} (96%) rename latex/{ystheorem.tex => ystheorem.sty} (95%) rename latex/{ystikz.tex => ystikz.sty} (93%) rename latex/{unicode.tex => ysunicode.sty} (84%) diff --git a/latex/inputDS.sty b/latex/inputDS.sty new file mode 100644 index 0000000..1589598 --- /dev/null +++ b/latex/inputDS.sty @@ -0,0 +1,5 @@ +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\ProvidesPackage{inputDS} +\RequirePackage{inputTD} + +\endinput \ No newline at end of file diff --git a/latex/inputDS.tex b/latex/inputDS.tex deleted file mode 100644 index a7a9be2..0000000 --- a/latex/inputDS.tex +++ /dev/null @@ -1,3 +0,0 @@ -\subimport{./}{inputTD} - -\endinput \ No newline at end of file diff --git a/latex/inputTD.tex b/latex/inputTD.sty similarity index 95% rename from latex/inputTD.tex rename to latex/inputTD.sty index 320639c..f9ff049 100644 --- a/latex/inputTD.tex +++ b/latex/inputTD.sty @@ -1,3 +1,5 @@ +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\ProvidesPackage{inputTD} \makeatletter \@ifundefined{stylecentrale} {\@ifundefined{resetlevel}{\def\resetlevel{[section]}}{}} @@ -16,10 +18,10 @@ \newtheorem*{important}{Important} \newtheorem*{rappel}{Rappel} -\usepackage{xfrac} -\usepackage{xparse} -\usepackage{comment} -\usepackage{xr} +\RequirePackage{xfrac} +\RequirePackage{xparse} +\RequirePackage{comment} +\RequirePackage{xr} \newif\ifcorrige \def\corr{\filigrane{\Huge CORRIG\'E --- CORRIG\'E}\global\corrigetrue\global\enoncefalse} @@ -28,7 +30,7 @@ \newif\ifenonce \enoncetrue -\usepackage{xstring} +\RequirePackage{xstring} \let\basejobname\jobname \IfEndWith{\jobname}{\detokenize{-ENONCE}}{\let\corr\relax\let\corrseul\relax\StrCut{\jobname}{\detokenize{-ENONCE}}\basejobname\dummy}{} \IfEndWith{\jobname}{\detokenize{-PROF}}{\corr\let\corr\relax\let\corrseul\relax\StrCut{\jobname}{\detokenize{-PROF}}\basejobname\dummy}{} diff --git a/latex/paquets.tex b/latex/paquets.sty similarity index 74% rename from latex/paquets.tex rename to latex/paquets.sty index a7d91ee..35f73d1 100644 --- a/latex/paquets.tex +++ b/latex/paquets.sty @@ -1,29 +1,30 @@ -\makeatletter -\usepackage{ifluatex} +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\ProvidesPackage{yspaquets} +\RequirePackage{ifluatex} \ifluatex - \usepackage{shellesc} + \RequirePackage{shellesc} \fi -\usepackage{silence} +\RequirePackage{silence} \WarningsOff[hyperref] -\usepackage{xcolor}% -\usepackage{colortbl} -\usepackage{graphicx}% -\usepackage{fontspec} -\usepackage{babel} -\usepackage{pdfpages} -\usepackage{textcomp} -\usepackage{latexsym} -\usepackage{amsmath} -\usepackage{amssymb} -\usepackage{mathtools} -\usepackage{xspace} -\usepackage{mdwlist} +\RequirePackage{xcolor}% +\RequirePackage{colortbl} +\RequirePackage{graphicx}% +\RequirePackage{fontspec} +\RequirePackage{babel} +\RequirePackage{pdfpages} +\RequirePackage{textcomp} +\RequirePackage{latexsym} +\RequirePackage{amsmath} +\RequirePackage{amssymb} +\RequirePackage{mathtools} +\RequirePackage{xspace} +\RequirePackage{mdwlist} \defaultfontfeatures{Ligatures=TeX} \setmainfont[SlantedFont=Gentium Basic, SlantedFeatures={FakeSlant},SmallCapsFont=Gentium Plus, SmallCapsFeatures={Letters=SmallCaps}]{Gentium Basic} \setmonofont[FakeStretch=.7,BoldFont=Source Code Pro Semibold]{Source Code Pro} -\usepackage[math-style=ISO, bold-style=ISO]{unicode-math} +\RequirePackage[math-style=ISO, bold-style=ISO]{unicode-math} %% bug recent dans unicode-math https://tex.stackexchange.com/a/475802/103608 \ExplSyntaxOn \cs_set:Nn \__um_fontdimen_to_percent:nN @@ -71,32 +72,31 @@ }{} -\usepackage[babel]{csquotes} -\usepackage{microtype} -\usepackage[hang, centerlast]{subfigure} +\RequirePackage[babel]{csquotes} +\RequirePackage{microtype} +\RequirePackage[hang, centerlast]{subfigure} -\usepackage{epsfig} +\RequirePackage{epsfig} -\subimport{./}{unicode.tex} +\RequirePackage{ysunicode} -\subimport{./}{ystikz.tex} -\subimport{./}{ystheorem.tex} +\RequirePackage{ystikz} +\RequirePackage{ystheorem} -\usepackage[backend=biber, style=alphabetic]{biblatex} -\edef\@mybibfile{\import@path commun.bib} -\addbibresource{\@mybibfile} +\RequirePackage[backend=biber, style=alphabetic]{biblatex} +\addbibresource{commun.bib} -\subimport{./}{yslistings.tex} +\RequirePackage{yslistings} -\usepackage{mdframed} +\RequirePackage{mdframed} \definecolor{shadecolor}{gray}{.9} -\usepackage{tikz} -\usepackage[printwatermark]{xwatermark} +\RequirePackage{tikz} +\RequirePackage[printwatermark]{xwatermark} \newsavebox\mybox \def\filigrane#1{% @@ -109,24 +109,24 @@ -\usepackage{multicol} +\RequirePackage{multicol} \newenvironment{enumq}{\begin{enumerate}\renewcommand*{\theenumi}{\alph{enumi}}\@ifundefined{thequestion}{\renewcommand*\p@enumi{\thecorrige.}}{\renewcommand*\p@enumi{\thequestion.}}}{\end{enumerate}} \newenvironment{multiq}[1]{\begin{multicols}{#1}\begin{enumq}}{\end{enumq}\end{multicols}} -\usepackage[nolinks]{qrcode} +\RequirePackage[nolinks]{qrcode} \def\marginqrcode#1{\marginparsep=2pt\marginparwidth=.9cm\marginpar{\qrcode[height=.9cm,level=L]{#1}}} \@ifpackageloaded{hyperref}{}{ -\usepackage{hyperref} +\RequirePackage{hyperref} } \hypersetup{hidelinks, hyperfootnotes=false, hyperindex=false, implicit=false, bookmarks=false, pdfpagelabels=false, breaklinks=true, pdfencoding=unicode} -\usepackage[os=win]{menukeys} +\RequirePackage[os=win]{menukeys} \renewmenumacro{\keys}{shadowedangularkeys} \renewmenumacro{\directory}{hyphenatepathswithblackfolder} \newmenumacro{\directorysymb}[/]{hyphenatepathswithblackfolder} -\subimport{./}{yssymbols.tex} +\RequirePackage{yssymbols} \AtEndDocument{\label{lastpage}} diff --git a/latex/ysbeamer.tex b/latex/ysbeamer.sty similarity index 95% rename from latex/ysbeamer.tex rename to latex/ysbeamer.sty index bd30752..50a74d7 100644 --- a/latex/ysbeamer.tex +++ b/latex/ysbeamer.sty @@ -1,9 +1,11 @@ -\makeatletter +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\ProvidesPackage{ysbeamer} + \let\ys@beamer\ -\@ifclassloaded{beamer}{}{\usepackage{beamerarticle}\parindent=0pt} +\@ifclassloaded{beamer}{}{\RequirePackage{beamerarticle}\parindent=0pt} -\subimport{./}{paquets} +\RequirePackage{paquets} \def\exemple{\mode
{Exemple}} \def\exemples{\mode
{Exemples}} @@ -130,5 +132,4 @@ \mode
{\parskip=1ex plus .5ex minus 0.5ex} \mode{\parskip=1ex plus .5fill minus 0.75ex} -\makeatother \endinput \ No newline at end of file diff --git a/latex/texmf/ysbeamerarticle.cls b/latex/ysbeamerarticle.cls similarity index 100% rename from latex/texmf/ysbeamerarticle.cls rename to latex/ysbeamerarticle.cls diff --git a/latex/yslistings.tex b/latex/yslistings.sty similarity index 96% rename from latex/yslistings.tex rename to latex/yslistings.sty index 76d0eb7..a2a381a 100644 --- a/latex/yslistings.tex +++ b/latex/yslistings.sty @@ -1,7 +1,8 @@ - -\usepackage{listings} -\usepackage{lstautogobble} -\usepackage{fontawesome} +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\ProvidesPackage{yslistings} +\RequirePackage{listings} +\RequirePackage{lstautogobble} +\RequirePackage{fontawesome} \newbox\codebreakbox \setbox\codebreakbox=\hbox{\textcolor[gray]{.75}{\scriptsize\upshape\faChevronCircleRight}} diff --git a/latex/yssymbols.tex b/latex/yssymbols.sty similarity index 96% rename from latex/yssymbols.tex rename to latex/yssymbols.sty index 1fd216f..b2f1dd0 100644 --- a/latex/yssymbols.tex +++ b/latex/yssymbols.sty @@ -1,4 +1,5 @@ - +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\ProvidesPackage{yssymbols} \let\lbr\lBrack %%% Crochet double ouvrant \let\rbr\rBrack %%% Crochet double fermant %% Ensembles, intervalles diff --git a/latex/ystheorem.tex b/latex/ystheorem.sty similarity index 95% rename from latex/ystheorem.tex rename to latex/ystheorem.sty index 78b3acf..b6ac374 100644 --- a/latex/ystheorem.tex +++ b/latex/ystheorem.sty @@ -1,7 +1,8 @@ - +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\ProvidesPackage{ystheorem} \@ifundefined{ys@beamer}{ -\usepackage[thmmarks, hyperref, amsmath]{ntheorem} +\RequirePackage[thmmarks, hyperref, amsmath]{ntheorem} \newtheoremstyle{breakindent}% {\item[\rlap{\vbox{\hbox{\hskip\labelsep \theorem@headerfont ##1\ ##2\theorem@separator}\hbox{\strut}}}]\hspace*{\parindent}}% diff --git a/latex/ystikz.tex b/latex/ystikz.sty similarity index 93% rename from latex/ystikz.tex rename to latex/ystikz.sty index 7cca7f6..3611dcc 100644 --- a/latex/ystikz.tex +++ b/latex/ystikz.sty @@ -1,9 +1,11 @@ +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\ProvidesPackage{ystikz} \ifluatex \def\pgfsysdriver{pgfsys-luatex.def} \else \def\pgfsysdriver{pgfsys-xetex.def} \fi -\usepackage{tikz} +\RequirePackage{tikz} \usetikzlibrary{matrix} \usetikzlibrary{positioning} @@ -21,7 +23,7 @@ % %% bug de PGF %% https://tex.stackexchange.com/a/453157 - \usepackage{luacode} + \RequirePackage{luacode} \begin{luacode*} function pgf_lookup_and_require(name) @@ -52,7 +54,7 @@ \usegdlibrary{layered, force} \fi -\usepackage[external]{forest} +\RequirePackage[external]{forest} %\tikzexternalize \forestset{% default preamble={ @@ -88,7 +90,7 @@ \pgfdeclarelayer{background} \pgfsetlayers{background,main} -\usepackage[inputdir=./_build/]{dot2texi} +\RequirePackage[inputdir=./_build/]{dot2texi} %%% https://tex.stackexchange.com/a/26386/103608 \usetikzlibrary{intersections} @@ -114,7 +116,7 @@ \only<#1>{\pgfkeysalso{#2}} }} -\usepackage{pgfplots} +\RequirePackage{pgfplots} \pgfplotsset{compat=1.15} \endinput \ No newline at end of file diff --git a/latex/unicode.tex b/latex/ysunicode.sty similarity index 84% rename from latex/unicode.tex rename to latex/ysunicode.sty index 3cee486..8ffcb12 100644 --- a/latex/unicode.tex +++ b/latex/ysunicode.sty @@ -1,5 +1,7 @@ -\usepackage{eurosym} -\usepackage{newunicodechar} +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\ProvidesPackage{ysunicode} +\RequirePackage{eurosym} +\RequirePackage{newunicodechar} \newunicodechar{€}{\geneuro{}} \newunicodechar{’}{'} \newunicodechar{α}{\alpha}