diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/denisbdoc/README.md (renamed from Master/texmf-dist/doc/latex/denisbdoc/README) | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/denisbdoc/README.txt | 10 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx | 361 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/denisbdoc/denisbdoc.ins | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/denisbdoc/denisbdoc.sty | 286 | ||||
| -rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 1 |
6 files changed, 492 insertions, 180 deletions
diff --git a/Master/texmf-dist/doc/latex/denisbdoc/README b/Master/texmf-dist/doc/latex/denisbdoc/README.md index 29e13ed7b72..a6ba00df1c2 100644 --- a/Master/texmf-dist/doc/latex/denisbdoc/README +++ b/Master/texmf-dist/doc/latex/denisbdoc/README.md @@ -1,5 +1,7 @@ ------------------------------------------------------------------------------ -denisbdoc --- A personal dirty package for documenting packages, version 0.1 +denisbdoc - A personal package for documenting classes and packages, version 0.2 +================================================================================ + +This (quick 'n dirty) package is just for documenting the classes I've written. Installation ------------ diff --git a/Master/texmf-dist/doc/latex/denisbdoc/README.txt b/Master/texmf-dist/doc/latex/denisbdoc/README.txt deleted file mode 100644 index 29e13ed7b72..00000000000 --- a/Master/texmf-dist/doc/latex/denisbdoc/README.txt +++ /dev/null @@ -1,10 +0,0 @@ ------------------------------------------------------------------------------ -denisbdoc --- A personal dirty package for documenting packages, version 0.1 - -Installation ------------- - -The package is supplied in `dtx` format. If you want to unpack the `.dtx` -yourself, running `tex denisbdoc.dtx` will extract the package. - -This package is currently not documented. diff --git a/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx b/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx index 65610311db4..eb86441bf3b 100644 --- a/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx +++ b/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.dtx @@ -3,8 +3,10 @@ \iffalse %</internal> %<*readme> ------------------------------------------------------------------------------ -denisbdoc --- A personal dirty package for documenting packages, version 0.1 +denisbdoc - A personal package for documenting classes and packages, version 0.2 +================================================================================ + +This (quick 'n dirty) package is just for documenting the classes I've written. Installation ------------ @@ -27,7 +29,7 @@ This package is currently not documented. \preamble ----------------------------------------------------------------------- ----------------------------------------------------------------------------- -denisbdoc --- A personal dirty package for documenting packages, version 0.1 +denisbdoc --- A personal dirty package for documenting packages, version 0.2 Maintained by Denis Bitouz'e E-mail: denis.bitouze@lmpa.univ-littoral.fr @@ -37,7 +39,7 @@ See http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2015 by +Copyright (C) 2015, 2016 by Denis Bitouz'e <denis.bitouze@lmpa.univ-littoral.fr> It may be distributed and/or modified under the conditions of @@ -67,8 +69,12 @@ This work consists of the file denisbdoc.dtx \nopreamble\nopostamble \usedir{doc/latex/denisbdoc} \generate{ - \file{README.txt}{\from{\jobname.dtx}{readme}} + \file{README.md}{\from{\jobname.dtx}{readme}} } +\usedir{/} +\generate{ + \file{README.md}{\from{\jobname.dtx}{readme}} +}% \ifx\fmtname\nameofplainTeX \expandafter\endbatchfile \else @@ -107,7 +113,8 @@ This work consists of the file denisbdoc.dtx % %\maketitle % -%\changes{v1.0}{2015/03/15}{First official release} +%\changes{v0.1}{2015/03/15}{First CTAN version} +%\changes{v0.2}{2016/04/04}{Second CTAN version} % %\begin{abstract} % ... @@ -178,7 +185,7 @@ This work consists of the file denisbdoc.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {denisbdoc} {2015/03/10} {0.1} +\ProvidesExplPackage {denisbdoc} {2016/04/04} {0.2} {A personal package for documenting packages} % \end{macrocode} % @@ -229,13 +236,14 @@ This work consists of the file denisbdoc.dtx % \RequirePackage{exsheets} % \let\task\denisbdoc@ORI@task \RequirePackage{parskip}% -\RequirePackage{amsthm}% -\RequirePackage{thmtools}% +% \RequirePackage{amsthm}% +% \RequirePackage{thmtools}% \RequirePackage{fixfoot}% \RequirePackage[inline]{enumitem}% \RequirePackage{afterpage}% \RequirePackage{tabulary}% \RequirePackage{calc}% +\RequirePackage{subcaption}% % \RequirePackage[lining]{libertine}% \RequirePackage{siunitx}% % \RequirePackage[a4paper]{geometry}% @@ -243,14 +251,16 @@ This work consists of the file denisbdoc.dtx \RequirePackage{varioref}% \RequirePackage{booktabs}% \RequirePackage[xr]{zref}% -\RequirePackage[multiple,bottom]{footmisc}% +\RequirePackage[multiple% ,bottom +]{footmisc}% \RequirePackage{rotating}% \RequirePackage{pdflscape}% -\RequirePackage{pdflscape}% +\RequirePackage{xspace}% \RequirePackage{hologo}% \RequirePackage{xifthen}% \RequirePackage{refcount}% \RequirePackage{iflang}% +\RequirePackage{ifpdf}% \RequirePackage{amssymb}% \RequirePackage{tocvsec2}% \RequirePackage{csquotes}% @@ -258,6 +268,10 @@ This work consists of the file denisbdoc.dtx % \RequirePackage[xindy]{imakeidx} % +\RequirePackage{scrlfile} +\BeforePackage{doc}{\let\oldmaketitle\maketitle} +\AfterPackage{doc}{\let\maketitle\oldmaketitle} +% \let\EUR\relax \@ifpackageloaded{tcolorbox}{% }{% @@ -270,23 +284,28 @@ This work consists of the file denisbdoc.dtx % used in code (here \pkg{TikZ} and \pkg{tcolorbox}). % \begin{macrocode} \ExplSyntaxOff +\ifpdf +\tcbuselibrary{listingsutf8} +\else +\tcbuselibrary{listings} +\RequirePackage{fontawesome}% +\lstMakeShortInline[style=dbtex]× +\fi \tcbuselibrary{% - listingsutf8, - % listings, documentation,theorems,breakable,skins% } \usetikzlibrary{trees,backgrounds,fit,calc,positioning} +\RequirePackage{attachfile2} \ExplSyntaxOn \RequirePackage{comment}% \RequirePackage{path}% -% \RequirePackage{fontawesome}% \RequirePackage{textcase}% \@ifpackageloaded{biblatex}{% }{% \RequirePackage[backend=biber,style=authortitle,autopunct=false,useprefix=true,backref,dashed=false]{biblatex}% }% \RequirePackage{babel}% -\RequirePackage[os=win]{menukeys}% +% \RequirePackage[useregional]{datetime2}% \RequirePackage[nodayofweek]{datetime}% % \RequirePackage{floatrow}% % \RequirePackage{subcaption}% @@ -298,11 +317,20 @@ This work consists of the file denisbdoc.dtx }{% \RequirePackage{nameref}% }% -\RequirePackage[all]{hypcap}% -\RequirePackage[numbered]{bookmark}% +\@ifpackageloaded{hypcap}{% +}{% + \RequirePackage[all]{hypcap}% +}% +\@ifpackageloaded{bookmark}{% +}{% + \RequirePackage[numbered]{bookmark}% +}% \@ifpackageloaded{glossaries}{% }{% -\RequirePackage[xindy,toc,hyperfirst=false]{glossaries}% + \RequirePackage[nowarn]{glossaries}% + \makeglossaries + \setglossarystyle{indexhypergroup} + \setacronymstyle{long-sc-short} }% \@ifpackageloaded{cleveref}{% }{% @@ -311,13 +339,16 @@ This work consists of the file denisbdoc.dtx % \end{macrocode} % We apply a patch currently necessary (cf. \url|http://tex.stackexchange.com/a/233524/18401|). % \begin{macrocode} -\inpenc@prehook=\expandafter{\the\inpenc@prehook - \xdef\saved@percent@catcode{\the\catcode`\%}% - \catcode`\%14\relax -} -\inpenc@posthook=\expandafter{\the\inpenc@posthook - \catcode`\%\saved@percent@catcode\relax -} +\ifundef{\inpenc@prehook}{% +}{% + \inpenc@prehook=\expandafter{\the\inpenc@prehook + \xdef\saved@percent@catcode{\the\catcode`\%}% + \catcode`\%14\relax + }% + \inpenc@posthook=\expandafter{\the\inpenc@posthook + \catcode`\%\saved@percent@catcode\relax + }% +}% % \end{macrocode} % % \begin{macrocode} @@ -437,14 +468,17 @@ This work consists of the file denisbdoc.dtx figurename,tablename,chaptername,pagename,seename,alsoname,proofname,bibname,glossaryname,% addto,captionsenglish,captionsfrench,lipsum,partname,refname,renewcommand*,% appendix,lstlistoflistings,graphicpath,loadglsentries,hypersetup,detect-all,SetWatermarkColor,% - @pnumwidth,bookmarksetup,DeclareTextCommand% + @pnumwidth,bookmarksetup,DeclareTextCommand,text,iiint,NewPairedDelimiter,% + norm,lnorm,llnorm,lpnorm,supnorm,abs,prt,brk,brc,lrangle,leqgeq,% + norm*,lnorm*,llnorm*,lpnorm*,supnorm*,abs*,prt*,brk*,brc*,lrangle*,leqgeq*% },% morekeywords=[1]{% Environments' names tabular,tabulary,math,document,minipage,eqnarray,eqnarray*,align,align*,% + equation,gather,multline,flalign,equation*,gather*,multline*,flalign*,% itemize,itemize*,enumerate,enumerate*,description,description*,% },% morekeywords=[2]{% Keys of key-value lists and packages' names - bookmarksdepth,see,babel,colorlinks,linktoc,width% + bookmarksdepth,see,babel,colorlinks,linktoc,width,left,right,subscript% },% morekeywords=[3]{% Values of key-value lists german,ngerman,french,english,spanish% @@ -482,7 +516,8 @@ This work consists of the file denisbdoc.dtx {% % Séquences de contrôles (communément appelées commandes ou macros) moretexcs={% - printbibliography,SetCiteCommand,autocite,addbibresource,fullcite% + printbibliography,SetCiteCommand,autocite,addbibresource,fullcite,% + textcite,cite,citeauthor% },% % Mots-clés de niveau 1 : arguments optionnels morekeywords={% @@ -601,7 +636,7 @@ This work consists of the file denisbdoc.dtx {% % Séquences de contrôles (communément appelées commandes ou macros) moretexcs={% - enquote,textelp% + enquote,textelp,textins,blockcquote% },% % Mots-clés de niveau 1 : arguments optionnels morekeywords={% @@ -612,10 +647,10 @@ This work consists of the file denisbdoc.dtx },% % Mots-clés de niveau 3 : arguments optionnels valeurs de clés dans clé=valeur morekeywords=[3]{% + skipbib% },% % Mots-clés de niveau 4 : arguments optionnels valeurs de clés dans clé=valeur morekeywords=[4]{% - skipbib% },% sensitive% }[keywords,tex,comments]% @@ -628,11 +663,10 @@ This work consists of the file denisbdoc.dtx },% % Mots-clés de niveau 1 : arguments optionnels morekeywords={% - listing,only,options,and,text% },% % Mots-clés de niveau 2 : arguments obligatoires et environnements morekeywords=[2]{% - colback,beamer,skins% + colback,beamer,skins,listing,only,options,and,text% },% % Mots-clés de niveau 3 : arguments optionnels valeurs de clés dans clé=valeur morekeywords=[3]{% @@ -647,23 +681,23 @@ This work consists of the file denisbdoc.dtx moretexcs={% lstset,lstinline,lstinputlisting,lstMakeShortInline,lstDeleteShortInline,lstdefinestyle% },% - % Mots-clés de niveau 1 : arguments optionnels + % Environments' names morekeywords={% listing,listingutf8% },% - % Mots-clés de niveau 2 : arguments obligatoires et environnements - morekeywords=[2]{% + % Environments' names + morekeywords=[1]{% lstlisting,% },% - % Mots-clés de niveau 3 : arguments optionnels clés dans clé=valeur - morekeywords=[3]{% + % Keys of key-value lists + morekeywords=[2]{% language,showtabs,escapeinside,mathescape,basicstyle,keywordstyle,commentstyle,% stringstyle,numbers,frame,framesep,escapechar,tab,aboveskip,belowskip,% linerange,backgroundcolor,rulecolor,framerule,inputencoding,stepnumber,numberstyle,% rulesepcolor,style% },% - % Mots-clés de niveau 4 : arguments optionnels valeurs de clés dans clé=valeur - morekeywords=[4]{% + % Values of key-value lists + morekeywords=[3]{% Ada,left,single,shadowbox,Python% },% sensitive% @@ -711,7 +745,6 @@ This work consists of the file denisbdoc.dtx % Definition of the \enquote{yad} \TeX{} dialect. % \begin{macrocode} \lstdefinelanguage[yad]{TeX}[LaTeX]{TeX}{% - % yathesis% TODO : à mettre ailleurs moretexcs={% Control sequences' names author,title,subtitle,academicfield,speciality,date,supervisor,cosupervisor,comonitor,% referee,guest,examiner,committeepresident,pres,institute,coinstitute,company,doctoralschool,% @@ -765,7 +798,6 @@ This work consists of the file denisbdoc.dtx % Definition of the \enquote{gzt} \TeX{} dialect. % \begin{macrocode} \lstdefinelanguage[gzt]{TeX}[LaTeX]{TeX}{% - % yathesis% TODO : à mettre ailleurs moretexcs={% Control sequences' names editorinchief,editor,president,classdesigner,classmaintainer,fontdesigner,% graphicdesigner,issuesetup,journalsetup,interviewee,academicsignature,% @@ -773,9 +805,9 @@ This work consists of the file denisbdoc.dtx acknowledgements,printminibios,aboutfrontcover,rubric,mathematics,% dossier,community,interview,teaching,parity,tellme,information,% rearviewmirror,tribute,books,email,question,smf,cad,Cad,gzt,% - century,aside,aside*,gztinput,gztnewtheorem,N,Z,D,Q,R,C,K,printauthorsdetails,% - date,title,author,maketitle,item,printbibliography,vec,surname,% - usetikzlibrary,arccos,arcsin,arctan,log,lg,le,leq,ge,geq,% + century,century*,aside,aside*,gztinput,gztnewtheorem,N,Z,D,Q,R,C,K,% + printauthorsdetails,date,title,author,maketitle,item,printbibliography,% + vec,surname,usetikzlibrary,arccos,arcsin,arctan,log,lg,le,leq,ge,geq,% gztverb,th,epigraph% },% % Environments' names @@ -792,8 +824,8 @@ This work consists of the file denisbdoc.dtx },% morekeywords=[2]{% Keys of key-value lists number,month,year,publisher,address,phone,fax,email,url,issn,isbn,short,minishort,notintoc,% - abstract,frenchtitle,englishtitle,% ,title - ,pictogram,list,help,diameter,textwidth,xshift,yshift,% + abstract,frenchtitle,englishtitle,% title,label,% + pictogram,list,help,diameter,textwidth,xshift,yshift,% affiliation,email,minibio,photo,webpage,frontcover,bibkey,copyright% },% morekeywords=[3]{% Values of key-value lists @@ -806,17 +838,63 @@ This work consists of the file denisbdoc.dtx }% % \end{macrocode} % -% \section{Settings} +% Definition of the \enquote{nwejm} \TeX{} dialect. +% \begin{macrocode} +\lstdefinelanguage[nwejm]{TeX}[LaTeX]{TeX}{% + moretexcs={% Control sequences' names + editorinchief,editor,president,classdesigner,classmaintainer,fontdesigner,% + graphicdesigner,issuesetup,journalsetup,interviewee,academicsignature,% + subtitle,editorial,nwejmtableofcontents,minitoc,presidentmessage,% + acknowledgements,printminibios,aboutfrontcover,rubric,mathematics,% + dossier,community,interview,teaching,parity,tellme,information,% + rearviewmirror,tribute,books,email,question,smf,ie,Ie,nwejm,% + century,century*,aside,aside*,nwejminput,nwejmnewtheorem,N,Z,D,Q,R,C,K,% + printauthorsdetails,date,title,author,maketitle,item,printbibliography,% + vec,surname,usetikzlibrary,arccos,arcsin,arctan,log,lg,le,leq,ge,geq,set,% + nwejmverb,th,epigraph,keywords,msc,acknowledgments,E,I,grad,Div,curl,rot,supp,% + DeclareMathOperator,BinaryOperators,dif% + },% + % Environments' names + morekeywords={% + nwejm,nwejmart,assertions,hypotheses% + },% + morekeywords=[1]{% Environments' names + abstract,minitoclist,bookreview,bookadvertisement,% + nwejmfigure,nwejmfigure*,nwejmtable,nwejmtable*,nwejmscan,nwejmcode,% + theorem,theoreme,corollary,corollaire,conjecture,proposition,% + lemma,lemme,axiom,axiome,definition,remark,remarque,example,exemple,notation,% + theorem*,theoreme*,corollary*,corollaire*,conjecture*,proposition*,proof,preuve,% + lemma*,lemme*,axiom*,axiome*,definition*,remark*,remarque*,example*,exemple*,notation*% + },% + morekeywords=[2]{% Keys of key-value lists + number,month,year,publisher,address,phone,fax,email,url,issn,isbn,short,minishort,notintoc,% + abstract,frenchtitle,englishtitle,% title,label,% + pictogram,list,help,diameter,textwidth,xshift,yshift,% + affiliation,affiliationtagged,email,minibio,photo,webpage,frontcover,bibkey,copyright% + },% + morekeywords=[3]{% Values of key-value lists + true,false,theorem,definition,proof% + },% + morekeywords=[4]{% Class and packages options + pagegrid,forprinter,cover,forauthors,% + },% + alsoletter={!-*1234560}% +}% +% \end{macrocode} % -% Déclaration des nouveaux noms de \enquote{théorèmes} en vue d'en faciliter le -% référencement grâce au \Package{cleveref}. +% Enhancements of the \enquote{bash} ×sh× dialect. % \begin{macrocode} -\AtEndPreamble{% - \crefname{tcb@cnt@dbexample}{exemple}{exemples}% - \crefname{tcb@cnt@dbremark}{remarque}{remarques}% - \crefname{tcb@cnt@dbwarning}{avertissement}{avertissements}% - \crefname{tcb@cnt@dbfaq}{question}{questions}% +\lstdefinelanguage{bash}[]{sh}% +{% + morekeywords={% + ssh-keygen,rsa,mkdir,cp,chmod,git,clone,tree,pull,lgr,lga,commit,% + ls,add,record,push% + },% + alsoletter={!-*}% }% +% \end{macrocode} +% +% \section{Settings} % \hypersetup{colorlinks}% % @@ -824,8 +902,8 @@ This work consists of the file denisbdoc.dtx % \setlength\bibinitsep{1.25\baselineskip} % -\setglossarystyle{indexhypergroup} -\setacronymstyle{long-sc-short} +% \setglossarystyle{indexhypergroup} +% \setacronymstyle{long-sc-short} % % \SetupExSheets[question]{type=exam} % \SetupExSheets[solution]{print=true} @@ -876,19 +954,22 @@ This work consists of the file denisbdoc.dtx alsolanguage=[hyperref]TeX, alsolanguage=[yad]TeX, alsolanguage=[gzt]TeX, + alsolanguage=[nwejm]TeX, texcsstyle=*\color{texcs}, breaklines=true, basicstyle=\normalfont\ttfamily, commentstyle=\color{comment}\itshape, - keywordstyle=\color{environment}, - keywordstyle=[2]\color{key}, - keywordstyle=[3]\color{value}, - keywordstyle=[4]\color{keyword4}, - keywordstyle=[5]\color{keyword5}, + keywordstyle={\color{environment}}, + keywordstyle={[1]\color{environment}}, + keywordstyle={[2]\color{key}}, + keywordstyle={[3]\color{value}}, + keywordstyle={[4]\color{keyword4}}, + keywordstyle={[5]\color{keyword5}}, moredelim=*[s][\color{math}\ttfamily]{\\[}{\\]}, moredelim=*[s][\color{math}\ttfamily]{$}{$}, stringstyle=\color{string}, columns=flexible, + keepspaces, numberstyle=\small, inputencoding=utf8/latin1, aboveskip=\c_@@_listings_aboveskip_skip, @@ -915,7 +996,7 @@ This work consists of the file denisbdoc.dtx /tcb/doclang/keys=Clés, /tcb/doclang/values=Valeurs, /tcb/doclang/pageshort=p., - % /tcb/documentation~listing~style=dbtex, + /tcb/documentation~listing~style=dbtex, /tcb/color~command=texcs, /tcb/color~environment=environment, /tcb/color~key=key, @@ -959,11 +1040,11 @@ This work consists of the file denisbdoc.dtx % For the \yatcl' documentation, using \Class{ltxdoc}, we need to % perform some changes in \Package{glossaries} provided by its author. % \begin{macrocode} -\renewcommand*{\newacronymhook}{% - \edef\tmp{\noexpand\textsc{\the\glsshorttok}}% - \expandafter\glsshorttok\expandafter{\tmp}% -}% -\renewcommand*{\acrpluralsuffix}{\textup{\glspluralsuffix}} +% \renewcommand*{\newacronymhook}{% +% \edef\tmp{\noexpand\textsc{\the\glsshorttok}}% +% \expandafter\glsshorttok\expandafter{\tmp}% +% }% +% \renewcommand*{\acrpluralsuffix}{\textup{\glspluralsuffix}} % \end{macrocode} % On définit une nouvelle clé pour la commande ×\includegraphics× de % sorte à pouvoir inclure les pages d'un \File{.pdf} externe en @@ -996,7 +1077,7 @@ This work consists of the file denisbdoc.dtx \_@@_alert:n {#1} }% \cs_set_eq:NN \_@@_orig_changes \changes -\NewDocumentCommand \changes { smmm } { +\DeclareDocumentCommand \changes { smmm } { \_@@_orig_changes{#2}{#3}{% \IfBooleanTF {#1} { @@ -1061,9 +1142,9 @@ This work consists of the file denisbdoc.dtx }% \cs_new_protected:Nn \_@@_file:n { - \bgroup% \color{magenta} + % \bgroup% \color{magenta} \texttt{#1} - \egroup + % \egroup } \NewDocumentCommand{\file}{ m } {% @@ -1093,7 +1174,13 @@ This work consists of the file denisbdoc.dtx % \cs_new_protected:Nn \_@@_links:nnn { - \href{#2#3#1}{\texttt{#3}}~\href{http://mirror.ctan.org/macros/latex/contrib/yathesis/#2#3#1}{\faExternalLink} + \cs_if_exist:NTF \faExternalLink {% + % \href{#2#3#1}{\texttt{#3}}~\href{http://mirror.ctan.org/macros/latex/contrib/yathesis/#2#3#1}{\faExternalLink} + \texttt{#3}~\textnormal{(\attachfile{#2#3#1})} + }{ + % \href{#2#3#1}{\texttt{#3}}~\href{http://mirror.ctan.org/macros/latex/contrib/yathesis/#2#3#1}{} + \texttt{#3}~\textnormal{(\attachfile{#2#3#1})} + } } \cs_new_protected:Nn \_@@_etctree: { @@ -1166,6 +1253,7 @@ This work consists of the file denisbdoc.dtx \ding{52} }{ \faLock + % \ding{52} }% } \ifnum\getpagerefnumber{sec-comm-oblig}=\thepage% @@ -1224,21 +1312,21 @@ This work consists of the file denisbdoc.dtx % \begin{macrocode} \NewDocumentCommand{\pdf}{} { - \acrshort{pdf} + \textsc{pdf} } % \end{macrocode} % % \begin{macro}{\aside} % \begin{macrocode} -% \NewDocumentCommand \aside { s m } {% -% \IfBooleanTF {#1} -% { -% \c_@@_aside_string_tl{}~#2 -% } -% { -% \c_@@_aside_string_tl{}~#2~\c_@@_aside_string_tl -% } -% } +\DeclareDocumentCommand \aside { s m } {% + \IfBooleanTF {#1} + { + \c_@@_aside_string_tl{}~#2 + } + { + \c_@@_aside_string_tl{}~#2~\c_@@_aside_string_tl + } +} % \end{macrocode} % \end{macro} % @@ -1332,32 +1420,81 @@ This work consists of the file denisbdoc.dtx % \subsection{Theorems} % % \begin{macrocode} -\newtcbtheorem[list~inside=dbwarninglist,number~within=section]{dbwarning}{Avertissement}{% +\tl_new:N \g_@@_number_within_tl +\tl_set:Nn \g_@@_number_within_tl {chapter} +\@ifclassloaded{gztarticle}{\tl_set:Nn \g_@@_number_within_tl {section}}{}% +\@ifclassloaded{nwejmart}{\tl_set:Nn \g_@@_number_within_tl {section}}{}% +% \end{macrocode} +% +% \begin{macrocode} +\newtcbtheorem[list~inside=dbwarninglist,number~within=\g_@@_number_within_tl,crefname={avertissement}{avertissements}]{dbwarning}{Avertissement}{% colback=red!5!white, colframe=red!75!black, dbtcb }{wa} % -\newtcbtheorem[list~inside=dbexamplelist,number~within=section]{dbexample}{Exemple}{% +\newtcbtheorem[list~inside=dbexamplelist,number~within=\g_@@_number_within_tl,crefname={exemple}{exemples}]{dbexample}{Exemple}{% colback=lime!5!white, colframe=lime!75!black, dbtcb }{ex} % -\newtcbtheorem[list~inside=dbremarklist,number~within=section]{dbremark}{Remarque}{% +\newtcbtheorem[list~inside=dbremarklist,number~within=\g_@@_number_within_tl,crefname={remarque}{remarques}]{dbremark}{Remarque}{% colback=cyan!5!white, colframe=cyan!75!black, dbtcb }{rq} -% \newtcbtheorem[list~inside=dbfaqlist,number~within=section]{dbfaq}{Question}{% -% colback=lightgray!5!white, -% colframe=lightgray!75!black, -% fontupper=\slshape, -% dbtcb -% }{faq} -% +\newtcbtheorem[list~inside=dbfaqlist,number~within=\g_@@_number_within_tl,crefname={question}{questions}]{dbfaq}{Question}{% + colback=lightgray!5!white, + colframe=lightgray!75!black, + fontupper=\slshape, + dbtcb +}{faq} % \end{macrocode} % +% \section{Macros for menu entries} +% +% The following code is borrowed from +% \href{http://tex.stackexchange.com/a/40637/18401}{Enrico Gregorio (egreg)}. +% \begin{macrocode} +\NewDocumentCommand{\menuentry}{ O{} m } + { + \group_begin: % to segregate local changes to keys and font + \keys_set:nn { menuentry } { #1 } + \exp_args:NNx \seq_set_split:Nnn \l_menuentry_seq { \l_menuentry_inputsep_tl } { #2 } + \tl_use:N \l_menuentry_font_tl + \bool_set_false:N \l_tmpa_bool + \seq_map_function:NN \l_menuentry_seq \menuentry_process:n + \group_end: + } +\NewDocumentCommand{\menuentryset} { m } + { \keys_set:nn { menuentry } { #1 } } + +\tl_new:N \l_menuentry_font_tl +\tl_new:N \l_menuentry_sep_tl +\tl_new:N \l_menuentry_inputsep_tl +\seq_new:N \l_menuentry_seq + +\cs_new:Npn \menuentry_process:n #1 + { + \bool_if:NTF \l_tmpa_bool + { \l_menuentry_sep_tl } + { \bool_set_true:N \l_tmpa_bool } + \tl_if_empty:nTF { #1 } {EMPTY~ARG!} { #1 } + } +\keys_define:nn { menuentry } + { + menufont .tl_set:N = \l_menuentry_font_tl , + menusep .tl_set:N = \l_menuentry_sep_tl, + inputsep .tl_set:N = \l_menuentry_inputsep_tl, + } +\keys_set:nn { menuentry } + { + menufont = \sffamily , + menusep = ${}\to{}$ + }% \end{macrocode} +\menuentryset{inputsep=>} +% % \section{Definitions specific to peticular classes or packages} % % \subsection{\Class{yathesis}} @@ -1382,15 +1519,15 @@ This work consists of the file denisbdoc.dtx % \begin{macrocode} \NewDocumentCommand \yat { } {% - \textsl{\texttt{\c_@@_yat_class_name_tl}} + \textsl{\texttt{\c_@@_yat_class_name_tl}}\xspace } \NewDocumentCommand \yatpa { } {% - \Package{\yat} + \Package{\yat}\xspace } \NewDocumentCommand \yatcl { } {% - \Class{\yat} + \Class{\yat}\xspace } % \end{macrocode} % \end{macro} @@ -1480,6 +1617,42 @@ This work consists of the file denisbdoc.dtx % \end{macro} % \end{macro} % +% \subsection{\Class{nwejm}} +% +% \begin{macrocode} +\tl_const:Nn \c_@@_nwejm_class_name_tl {nwejm} +\tl_const:Nn \c_@@_nwejmauthor_class_name_tl {nwejmart} +% \end{macrocode} +% +% \begin{macro}{\nwejm} +% \begin{macro}{\nwejmcl} +% \begin{macrocode} +\ProvideDocumentCommand \nwejm { s } { + \IfBooleanTF {#1} + { + \textit{\c_@@_journal_title_string_tl} + } + { + \textit{\c_@@_journal_short_title_string_tl} + } +} +\ProvideDocumentCommand \nwejmcl { } +{% + \Class{\textsl{\texttt{\c_@@_nwejm_class_name_tl}}} +} +\NewDocumentCommand \nwejmauthor { } +{% + \textsl{\texttt{\c_@@_nwejmauthor_class_name_tl}} +} +\NewDocumentCommand \nwejmauthorcl { } +{% + \Class{\textsl{\texttt{\c_@@_nwejmauthor_class_name_tl}}} +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% % We switch to a \enquote{normal} category code régime. % \begin{macrocode} \ExplSyntaxOff diff --git a/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.ins b/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.ins index 4e96589a9df..cd5c9f11823 100644 --- a/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.ins +++ b/Master/texmf-dist/source/latex/denisbdoc/denisbdoc.ins @@ -7,7 +7,7 @@ %% denisbdoc.dtx (with options: `install') %% ----------------------------------------------------------------------- %% ----------------------------------------------------------------------------- -%% denisbdoc --- A personal dirty package for documenting packages, version 0.1 +%% denisbdoc --- A personal dirty package for documenting packages, version 0.2 %% %% Maintained by Denis Bitouz'e %% E-mail: denis.bitouze@lmpa.univ-littoral.fr @@ -20,7 +20,7 @@ \preamble ----------------------------------------------------------------------- ----------------------------------------------------------------------------- -denisbdoc --- A personal dirty package for documenting packages, version 0.1 +denisbdoc --- A personal dirty package for documenting packages, version 0.2 Maintained by Denis Bitouz'e E-mail: denis.bitouze@lmpa.univ-littoral.fr @@ -30,7 +30,7 @@ See http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2015 by +Copyright (C) 2015, 2016 by Denis Bitouz'e <denis.bitouze@lmpa.univ-littoral.fr> It may be distributed and/or modified under the conditions of @@ -51,7 +51,7 @@ This work consists of the file denisbdoc.dtx \file{\jobname.sty}{\from{\jobname.dtx}{package}} } \endbatchfile -%% Copyright (C) 2015 by +%% Copyright (C) 2015, 2016 by %% Denis Bitouz'e <denis.bitouze@lmpa.univ-littoral.fr> %% %% It may be distributed and/or modified under the conditions of diff --git a/Master/texmf-dist/tex/latex/denisbdoc/denisbdoc.sty b/Master/texmf-dist/tex/latex/denisbdoc/denisbdoc.sty index 63fc3351b57..98f112c427b 100644 --- a/Master/texmf-dist/tex/latex/denisbdoc/denisbdoc.sty +++ b/Master/texmf-dist/tex/latex/denisbdoc/denisbdoc.sty @@ -7,7 +7,7 @@ %% denisbdoc.dtx (with options: `package') %% ----------------------------------------------------------------------- %% ----------------------------------------------------------------------------- -%% denisbdoc --- A personal dirty package for documenting packages, version 0.1 +%% denisbdoc --- A personal dirty package for documenting packages, version 0.2 %% %% Maintained by Denis Bitouz'e %% E-mail: denis.bitouze@lmpa.univ-littoral.fr @@ -16,7 +16,7 @@ %% ----------------------------------------------------------------------------- %% \RequirePackage{expl3,l3keys2e,xparse} -\ProvidesExplPackage {denisbdoc} {2015/03/10} {0.1} +\ProvidesExplPackage {denisbdoc} {2016/04/04} {0.2} {A personal package for documenting packages} \@ifpackagelater { expl3 } { 2012/11/21 } { } @@ -40,43 +40,53 @@ \RequirePackage{xpatch}% \AtEndPreamble{\RequirePackage{morewrites}}% \RequirePackage{parskip}% -\RequirePackage{amsthm}% -\RequirePackage{thmtools}% \RequirePackage{fixfoot}% \RequirePackage[inline]{enumitem}% \RequirePackage{afterpage}% \RequirePackage{tabulary}% \RequirePackage{calc}% +\RequirePackage{subcaption}% \RequirePackage{siunitx}% \RequirePackage[nottoc,notindex]{tocbibind}% \RequirePackage{varioref}% \RequirePackage{booktabs}% \RequirePackage[xr]{zref}% -\RequirePackage[multiple,bottom]{footmisc}% +\RequirePackage[multiple% ,bottom +]{footmisc}% \RequirePackage{rotating}% \RequirePackage{pdflscape}% -\RequirePackage{pdflscape}% +\RequirePackage{xspace}% \RequirePackage{hologo}% \RequirePackage{xifthen}% \RequirePackage{refcount}% \RequirePackage{iflang}% +\RequirePackage{ifpdf}% \RequirePackage{amssymb}% \RequirePackage{tocvsec2}% \RequirePackage{csquotes}% \RequirePackage{tikz}% \RequirePackage[xindy]{imakeidx} +\RequirePackage{scrlfile} +\BeforePackage{doc}{\let\oldmaketitle\maketitle} +\AfterPackage{doc}{\let\maketitle\oldmaketitle} \let\EUR\relax \@ifpackageloaded{tcolorbox}{% }{% \RequirePackage{tcolorbox}% }% \ExplSyntaxOff +\ifpdf +\tcbuselibrary{listingsutf8} +\else +\tcbuselibrary{listings} +\RequirePackage{fontawesome}% +\lstMakeShortInline[style=dbtex]^^c3^^97 +\fi \tcbuselibrary{% - listingsutf8, - % listings, documentation,theorems,breakable,skins% } \usetikzlibrary{trees,backgrounds,fit,calc,positioning} +\RequirePackage{attachfile2} \ExplSyntaxOn \RequirePackage{comment}% \RequirePackage{path}% @@ -86,7 +96,6 @@ \RequirePackage[backend=biber,style=authortitle,autopunct=false,useprefix=true,backref,dashed=false]{biblatex}% }% \RequirePackage{babel}% -\RequirePackage[os=win]{menukeys}% \RequirePackage[nodayofweek]{datetime}% \@ifpackageloaded{hyperref}{% }{% @@ -96,23 +105,35 @@ }{% \RequirePackage{nameref}% }% -\RequirePackage[all]{hypcap}% -\RequirePackage[numbered]{bookmark}% +\@ifpackageloaded{hypcap}{% +}{% + \RequirePackage[all]{hypcap}% +}% +\@ifpackageloaded{bookmark}{% +}{% + \RequirePackage[numbered]{bookmark}% +}% \@ifpackageloaded{glossaries}{% }{% -\RequirePackage[xindy,toc,hyperfirst=false]{glossaries}% + \RequirePackage[nowarn]{glossaries}% + \makeglossaries + \setglossarystyle{indexhypergroup} + \setacronymstyle{long-sc-short} }% \@ifpackageloaded{cleveref}{% }{% \RequirePackage{cleveref}% }% -\inpenc@prehook=\expandafter{\the\inpenc@prehook - \xdef\saved@percent@catcode{\the\catcode`\%}% - \catcode`\%14\relax -} -\inpenc@posthook=\expandafter{\the\inpenc@posthook - \catcode`\%\saved@percent@catcode\relax -} +\ifundef{\inpenc@prehook}{% +}{% + \inpenc@prehook=\expandafter{\the\inpenc@prehook + \xdef\saved@percent@catcode{\the\catcode`\%}% + \catcode`\%14\relax + }% + \inpenc@posthook=\expandafter{\the\inpenc@posthook + \catcode`\%\saved@percent@catcode\relax + }% +}% \DeclareUrlCommand\urldirectory{\urlstyle{tt}} \ExplSyntaxOn \tl_const:Nn \c__denisbdoc_template_string_tl {canevas} @@ -160,14 +181,17 @@ figurename,tablename,chaptername,pagename,seename,alsoname,proofname,bibname,glossaryname,% addto,captionsenglish,captionsfrench,lipsum,partname,refname,renewcommand*,% appendix,lstlistoflistings,graphicpath,loadglsentries,hypersetup,detect-all,SetWatermarkColor,% - @pnumwidth,bookmarksetup,DeclareTextCommand% + @pnumwidth,bookmarksetup,DeclareTextCommand,text,iiint,NewPairedDelimiter,% + norm,lnorm,llnorm,lpnorm,supnorm,abs,prt,brk,brc,lrangle,leqgeq,% + norm*,lnorm*,llnorm*,lpnorm*,supnorm*,abs*,prt*,brk*,brc*,lrangle*,leqgeq*% },% morekeywords=[1]{% Environments' names tabular,tabulary,math,document,minipage,eqnarray,eqnarray*,align,align*,% + equation,gather,multline,flalign,equation*,gather*,multline*,flalign*,% itemize,itemize*,enumerate,enumerate*,description,description*,% },% morekeywords=[2]{% Keys of key-value lists and packages' names - bookmarksdepth,see,babel,colorlinks,linktoc,width% + bookmarksdepth,see,babel,colorlinks,linktoc,width,left,right,subscript% },% morekeywords=[3]{% Values of key-value lists german,ngerman,french,english,spanish% @@ -204,7 +228,8 @@ {% % S^^c3^^a9quences de contr^^c3^^b4les (commun^^c3^^a9ment appel^^c3^^a9es commandes ou macros) moretexcs={% - printbibliography,SetCiteCommand,autocite,addbibresource,fullcite% + printbibliography,SetCiteCommand,autocite,addbibresource,fullcite,% + textcite,cite,citeauthor% },% % Mots-cl^^c3^^a9s de niveau 1 : arguments optionnels morekeywords={% @@ -244,7 +269,7 @@ {% % S^^c3^^a9quences de contr^^c3^^b4les (commun^^c3^^a9ment appel^^c3^^a9es commandes ou macros) moretexcs={% - enquote,textelp% + enquote,textelp,textins,blockcquote% },% % Mots-cl^^c3^^a9s de niveau 1 : arguments optionnels morekeywords={% @@ -255,10 +280,10 @@ },% % Mots-cl^^c3^^a9s de niveau 3 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur morekeywords=[3]{% + skipbib% },% % Mots-cl^^c3^^a9s de niveau 4 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur morekeywords=[4]{% - skipbib% },% sensitive% }[keywords,tex,comments]% @@ -270,11 +295,10 @@ },% % Mots-cl^^c3^^a9s de niveau 1 : arguments optionnels morekeywords={% - listing,only,options,and,text% },% % Mots-cl^^c3^^a9s de niveau 2 : arguments obligatoires et environnements morekeywords=[2]{% - colback,beamer,skins% + colback,beamer,skins,listing,only,options,and,text% },% % Mots-cl^^c3^^a9s de niveau 3 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur morekeywords=[3]{% @@ -288,23 +312,23 @@ moretexcs={% lstset,lstinline,lstinputlisting,lstMakeShortInline,lstDeleteShortInline,lstdefinestyle% },% - % Mots-cl^^c3^^a9s de niveau 1 : arguments optionnels + % Environments' names morekeywords={% listing,listingutf8% },% - % Mots-cl^^c3^^a9s de niveau 2 : arguments obligatoires et environnements - morekeywords=[2]{% + % Environments' names + morekeywords=[1]{% lstlisting,% },% - % Mots-cl^^c3^^a9s de niveau 3 : arguments optionnels cl^^c3^^a9s dans cl^^c3^^a9=valeur - morekeywords=[3]{% + % Keys of key-value lists + morekeywords=[2]{% language,showtabs,escapeinside,mathescape,basicstyle,keywordstyle,commentstyle,% stringstyle,numbers,frame,framesep,escapechar,tab,aboveskip,belowskip,% linerange,backgroundcolor,rulecolor,framerule,inputencoding,stepnumber,numberstyle,% rulesepcolor,style% },% - % Mots-cl^^c3^^a9s de niveau 4 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur - morekeywords=[4]{% + % Values of key-value lists + morekeywords=[3]{% Ada,left,single,shadowbox,Python% },% sensitive% @@ -346,7 +370,6 @@ sensitive% }[keywords,tex,comments]% \lstdefinelanguage[yad]{TeX}[LaTeX]{TeX}{% - % yathesis% TODO : ^^c3^^a0 mettre ailleurs moretexcs={% Control sequences' names author,title,subtitle,academicfield,speciality,date,supervisor,cosupervisor,comonitor,% referee,guest,examiner,committeepresident,pres,institute,coinstitute,company,doctoralschool,% @@ -396,7 +419,6 @@ alsoletter={!-*1234560}% }% \lstdefinelanguage[gzt]{TeX}[LaTeX]{TeX}{% - % yathesis% TODO : ^^c3^^a0 mettre ailleurs moretexcs={% Control sequences' names editorinchief,editor,president,classdesigner,classmaintainer,fontdesigner,% graphicdesigner,issuesetup,journalsetup,interviewee,academicsignature,% @@ -404,9 +426,9 @@ acknowledgements,printminibios,aboutfrontcover,rubric,mathematics,% dossier,community,interview,teaching,parity,tellme,information,% rearviewmirror,tribute,books,email,question,smf,cad,Cad,gzt,% - century,aside,aside*,gztinput,gztnewtheorem,N,Z,D,Q,R,C,K,printauthorsdetails,% - date,title,author,maketitle,item,printbibliography,vec,surname,% - usetikzlibrary,arccos,arcsin,arctan,log,lg,le,leq,ge,geq,% + century,century*,aside,aside*,gztinput,gztnewtheorem,N,Z,D,Q,R,C,K,% + printauthorsdetails,date,title,author,maketitle,item,printbibliography,% + vec,surname,usetikzlibrary,arccos,arcsin,arctan,log,lg,le,leq,ge,geq,% gztverb,th,epigraph% },% % Environments' names @@ -423,8 +445,8 @@ },% morekeywords=[2]{% Keys of key-value lists number,month,year,publisher,address,phone,fax,email,url,issn,isbn,short,minishort,notintoc,% - abstract,frenchtitle,englishtitle,% ,title - ,pictogram,list,help,diameter,textwidth,xshift,yshift,% + abstract,frenchtitle,englishtitle,% title,label,% + pictogram,list,help,diameter,textwidth,xshift,yshift,% affiliation,email,minibio,photo,webpage,frontcover,bibkey,copyright% },% morekeywords=[3]{% Values of key-value lists @@ -435,17 +457,57 @@ },% alsoletter={!-*1234560}% }% -\AtEndPreamble{% - \crefname{tcb@cnt@dbexample}{exemple}{exemples}% - \crefname{tcb@cnt@dbremark}{remarque}{remarques}% - \crefname{tcb@cnt@dbwarning}{avertissement}{avertissements}% - \crefname{tcb@cnt@dbfaq}{question}{questions}% +\lstdefinelanguage[nwejm]{TeX}[LaTeX]{TeX}{% + moretexcs={% Control sequences' names + editorinchief,editor,president,classdesigner,classmaintainer,fontdesigner,% + graphicdesigner,issuesetup,journalsetup,interviewee,academicsignature,% + subtitle,editorial,nwejmtableofcontents,minitoc,presidentmessage,% + acknowledgements,printminibios,aboutfrontcover,rubric,mathematics,% + dossier,community,interview,teaching,parity,tellme,information,% + rearviewmirror,tribute,books,email,question,smf,ie,Ie,nwejm,% + century,century*,aside,aside*,nwejminput,nwejmnewtheorem,N,Z,D,Q,R,C,K,% + printauthorsdetails,date,title,author,maketitle,item,printbibliography,% + vec,surname,usetikzlibrary,arccos,arcsin,arctan,log,lg,le,leq,ge,geq,set,% + nwejmverb,th,epigraph,keywords,msc,acknowledgments,E,I,grad,Div,curl,rot,supp,% + DeclareMathOperator,BinaryOperators,dif% + },% + % Environments' names + morekeywords={% + nwejm,nwejmart,assertions,hypotheses% + },% + morekeywords=[1]{% Environments' names + abstract,minitoclist,bookreview,bookadvertisement,% + nwejmfigure,nwejmfigure*,nwejmtable,nwejmtable*,nwejmscan,nwejmcode,% + theorem,theoreme,corollary,corollaire,conjecture,proposition,% + lemma,lemme,axiom,axiome,definition,remark,remarque,example,exemple,notation,% + theorem*,theoreme*,corollary*,corollaire*,conjecture*,proposition*,proof,preuve,% + lemma*,lemme*,axiom*,axiome*,definition*,remark*,remarque*,example*,exemple*,notation*% + },% + morekeywords=[2]{% Keys of key-value lists + number,month,year,publisher,address,phone,fax,email,url,issn,isbn,short,minishort,notintoc,% + abstract,frenchtitle,englishtitle,% title,label,% + pictogram,list,help,diameter,textwidth,xshift,yshift,% + affiliation,affiliationtagged,email,minibio,photo,webpage,frontcover,bibkey,copyright% + },% + morekeywords=[3]{% Values of key-value lists + true,false,theorem,definition,proof% + },% + morekeywords=[4]{% Class and packages options + pagegrid,forprinter,cover,forauthors,% + },% + alsoletter={!-*1234560}% +}% +\lstdefinelanguage{bash}[]{sh}% +{% + morekeywords={% + ssh-keygen,rsa,mkdir,cp,chmod,git,clone,tree,pull,lgr,lga,commit,% + ls,add,record,push% + },% + alsoletter={!-*}% }% \hypersetup{colorlinks}% \presetkeys{todonotes}{fancyline, color=white}{}% \setlength\bibinitsep{1.25\baselineskip} -\setglossarystyle{indexhypergroup} -\setacronymstyle{long-sc-short} \SetCiteCommand{\autocite} \renewcommand{\ttdefault}{lmtt} \xapptocmd{\@section}{% @@ -468,19 +530,22 @@ alsolanguage=[hyperref]TeX, alsolanguage=[yad]TeX, alsolanguage=[gzt]TeX, + alsolanguage=[nwejm]TeX, texcsstyle=*\color{texcs}, breaklines=true, basicstyle=\normalfont\ttfamily, commentstyle=\color{comment}\itshape, - keywordstyle=\color{environment}, - keywordstyle=[2]\color{key}, - keywordstyle=[3]\color{value}, - keywordstyle=[4]\color{keyword4}, - keywordstyle=[5]\color{keyword5}, + keywordstyle={\color{environment}}, + keywordstyle={[1]\color{environment}}, + keywordstyle={[2]\color{key}}, + keywordstyle={[3]\color{value}}, + keywordstyle={[4]\color{keyword4}}, + keywordstyle={[5]\color{keyword5}}, moredelim=*[s][\color{math}\ttfamily]{\\[}{\\]}, moredelim=*[s][\color{math}\ttfamily]{$}{$}, stringstyle=\color{string}, columns=flexible, + keepspaces, numberstyle=\small, inputencoding=utf8/latin1, aboveskip=\c__denisbdoc_listings_aboveskip_skip, @@ -502,7 +567,7 @@ /tcb/doclang/keys=Cl^^c3^^a9s, /tcb/doclang/values=Valeurs, /tcb/doclang/pageshort=p., - % /tcb/documentation~listing~style=dbtex, + /tcb/documentation~listing~style=dbtex, /tcb/color~command=texcs, /tcb/color~environment=environment, /tcb/color~key=key, @@ -532,11 +597,6 @@ }% }% \def\disp@com#1{\colDef{\ttfamily#1}} -\renewcommand*{\newacronymhook}{% - \edef\tmp{\noexpand\textsc{\the\glsshorttok}}% - \expandafter\glsshorttok\expandafter{\tmp}% -}% -\renewcommand*{\acrpluralsuffix}{\textup{\glspluralsuffix}} \define@key{Gin}{bylabel}{% \edef\@tempa{{Gin}{page=\zref@extract{#1}{abspage}}}% \expandafter\setkeys\@tempa% @@ -553,7 +613,7 @@ \__denisbdoc_alert:n {#1} }% \cs_set_eq:NN \__denisbdoc_orig_changes \changes -\NewDocumentCommand \changes { smmm } { +\DeclareDocumentCommand \changes { smmm } { \__denisbdoc_orig_changes{#2}{#3}{% \IfBooleanTF {#1} { @@ -615,9 +675,9 @@ }% \cs_new_protected:Nn \__denisbdoc_file:n { - \bgroup% \color{magenta} + % \bgroup% \color{magenta} \texttt{#1} - \egroup + % \egroup } \NewDocumentCommand{\file}{ m } {% @@ -645,7 +705,13 @@ } \cs_new_protected:Nn \__denisbdoc_links:nnn { - \href{#2#3#1}{\texttt{#3}}~\href{http://mirror.ctan.org/macros/latex/contrib/yathesis/#2#3#1}{\faExternalLink} + \cs_if_exist:NTF \faExternalLink {% + % \href{#2#3#1}{\texttt{#3}}~\href{http://mirror.ctan.org/macros/latex/contrib/yathesis/#2#3#1}{\faExternalLink} + \texttt{#3}~\textnormal{(\attachfile{#2#3#1})} + }{ + % \href{#2#3#1}{\texttt{#3}}~\href{http://mirror.ctan.org/macros/latex/contrib/yathesis/#2#3#1}{} + \texttt{#3}~\textnormal{(\attachfile{#2#3#1})} + } } \cs_new_protected:Nn \__denisbdoc_etctree: { @@ -717,6 +783,7 @@ \ding{52} }{ \faLock + % \ding{52} }% } \ifnum\getpagerefnumber{sec-comm-oblig}=\thepage% @@ -771,7 +838,16 @@ }% \NewDocumentCommand{\pdf}{} { - \acrshort{pdf} + \textsc{pdf} +} +\DeclareDocumentCommand \aside { s m } {% + \IfBooleanTF {#1} + { + \c__denisbdoc_aside_string_tl{}~#2 + } + { + \c__denisbdoc_aside_string_tl{}~#2~\c__denisbdoc_aside_string_tl + } } \zexternaldocument{\c__denisbdoc_treesample_string_tl/these}% \cs_new_protected:Nn \__denisbdoc_screenshot:nn @@ -816,21 +892,68 @@ listing~options={rangebeginprefix=\\,rangeendsuffix=\},#2}, #3, }% -\newtcbtheorem[list~inside=dbwarninglist,number~within=section]{dbwarning}{Avertissement}{% +\tl_new:N \g__denisbdoc_number_within_tl +\tl_set:Nn \g__denisbdoc_number_within_tl {chapter} +\@ifclassloaded{gztarticle}{\tl_set:Nn \g__denisbdoc_number_within_tl {section}}{}% +\@ifclassloaded{nwejmart}{\tl_set:Nn \g__denisbdoc_number_within_tl {section}}{}% +\newtcbtheorem[list~inside=dbwarninglist,number~within=\g__denisbdoc_number_within_tl,crefname={avertissement}{avertissements}]{dbwarning}{Avertissement}{% colback=red!5!white, colframe=red!75!black, dbtcb }{wa} -\newtcbtheorem[list~inside=dbexamplelist,number~within=section]{dbexample}{Exemple}{% +\newtcbtheorem[list~inside=dbexamplelist,number~within=\g__denisbdoc_number_within_tl,crefname={exemple}{exemples}]{dbexample}{Exemple}{% colback=lime!5!white, colframe=lime!75!black, dbtcb }{ex} -\newtcbtheorem[list~inside=dbremarklist,number~within=section]{dbremark}{Remarque}{% +\newtcbtheorem[list~inside=dbremarklist,number~within=\g__denisbdoc_number_within_tl,crefname={remarque}{remarques}]{dbremark}{Remarque}{% colback=cyan!5!white, colframe=cyan!75!black, dbtcb }{rq} +\newtcbtheorem[list~inside=dbfaqlist,number~within=\g__denisbdoc_number_within_tl,crefname={question}{questions}]{dbfaq}{Question}{% + colback=lightgray!5!white, + colframe=lightgray!75!black, + fontupper=\slshape, + dbtcb +}{faq} +\NewDocumentCommand{\menuentry}{ O{} m } + { + \group_begin: % to segregate local changes to keys and font + \keys_set:nn { menuentry } { #1 } + \exp_args:NNx \seq_set_split:Nnn \l_menuentry_seq { \l_menuentry_inputsep_tl } { #2 } + \tl_use:N \l_menuentry_font_tl + \bool_set_false:N \l_tmpa_bool + \seq_map_function:NN \l_menuentry_seq \menuentry_process:n + \group_end: + } +\NewDocumentCommand{\menuentryset} { m } + { \keys_set:nn { menuentry } { #1 } } + +\tl_new:N \l_menuentry_font_tl +\tl_new:N \l_menuentry_sep_tl +\tl_new:N \l_menuentry_inputsep_tl +\seq_new:N \l_menuentry_seq + +\cs_new:Npn \menuentry_process:n #1 + { + \bool_if:NTF \l_tmpa_bool + { \l_menuentry_sep_tl } + { \bool_set_true:N \l_tmpa_bool } + \tl_if_empty:nTF { #1 } {EMPTY~ARG!} { #1 } + } +\keys_define:nn { menuentry } + { + menufont .tl_set:N = \l_menuentry_font_tl , + menusep .tl_set:N = \l_menuentry_sep_tl, + inputsep .tl_set:N = \l_menuentry_inputsep_tl, + } +\keys_set:nn { menuentry } + { + menufont = \sffamily , + menusep = ${}\to{}$ + }% \end{macrocode} +\menuentryset{inputsep=>} \tl_const:Nn \c__denisbdoc_yat_class_name_tl {yathesis} \tl_const:Nn \c__denisbdoc_configuration_directory_string_tl {configuration} \tl_const:Nn \c__denisbdoc_configuration_file_string_tl {thesis.cfg} @@ -844,15 +967,15 @@ \tl_const:Nn \c__denisbdoc_thesis_master_file_string_tl {these} \NewDocumentCommand \yat { } {% - \textsl{\texttt{\c__denisbdoc_yat_class_name_tl}} + \textsl{\texttt{\c__denisbdoc_yat_class_name_tl}}\xspace } \NewDocumentCommand \yatpa { } {% - \Package{\yat} + \Package{\yat}\xspace } \NewDocumentCommand \yatcl { } {% - \Class{\yat} + \Class{\yat}\xspace } \NewDocumentCommand \configurationdirectory { } {% @@ -908,8 +1031,31 @@ {% \Class{\textsl{\texttt{\c__denisbdoc_gztauthor_class_name_tl}}} } +\tl_const:Nn \c__denisbdoc_nwejm_class_name_tl {nwejm} +\tl_const:Nn \c__denisbdoc_nwejmauthor_class_name_tl {nwejmart} +\ProvideDocumentCommand \nwejm { s } { + \IfBooleanTF {#1} + { + \textit{\c__denisbdoc_journal_title_string_tl} + } + { + \textit{\c__denisbdoc_journal_short_title_string_tl} + } +} +\ProvideDocumentCommand \nwejmcl { } +{% + \Class{\textsl{\texttt{\c__denisbdoc_nwejm_class_name_tl}}} +} +\NewDocumentCommand \nwejmauthor { } +{% + \textsl{\texttt{\c__denisbdoc_nwejmauthor_class_name_tl}} +} +\NewDocumentCommand \nwejmauthorcl { } +{% + \Class{\textsl{\texttt{\c__denisbdoc_nwejmauthor_class_name_tl}}} +} \ExplSyntaxOff -%% Copyright (C) 2015 by +%% Copyright (C) 2015, 2016 by %% Denis Bitouz'e <denis.bitouze@lmpa.univ-littoral.fr> %% %% It may be distributed and/or modified under the conditions of diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 57d98c3871e..fcfbdf2f489 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1258,6 +1258,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'listbib' => '&POSTlistbib', 'lithuanian' => '&POSTlithuanian', 'lollipop' => '&POST_otherformat', + 'lua-check-hyphen' => '&POST_rmsymlink', 'luaotfload' => '&POST_do_man', 'luatexja' => '&POSTluatexja', 'm-tx' => '&POST_do_man', |