diff --git a/TM.sty b/TM.sty index 149975b..80cde09 100755 --- a/TM.sty +++ b/TM.sty @@ -75,22 +75,313 @@ \usepackage{textcase} % Mettre en majuscule ou minuscule sans bugs % Listings -\usepackage{listings} % Listings et sa configuration pour les accents dans le code +\usepackage{listings} % Listings et sa configuration +\lstdefinelanguage{JavaScript}{ + morekeywords={break, case, catch, continue, debugger, default, delete, do, else, false, finally, for, function, if, in, instanceof, new, null, return, switch, this, throw, true, try, typeof, var, void, while, with}, + morecomment=[s]{/*}{*/}, + morecomment=[l]//, + morestring=[b]", + morestring=[b]' + } +\lstdefinelanguage{CSS}{ + keywords={accelerator,azimuth,background,background-attachment, + background-color,background-image,background-position, + background-position-x,background-position-y,background-repeat, + behavior,border,border-bottom,border-bottom-color, + border-bottom-style,border-bottom-width,border-collapse, + border-color,border-left,border-left-color,border-left-style, + border-left-width,border-right,border-right-color, + border-right-style,border-right-width,border-spacing, + border-style,border-top,border-top-color,border-top-style, + border-top-width,border-width,bottom,caption-side,clear, + clip,color,content,counter-increment,counter-reset,cue, + cue-after,cue-before,cursor,direction,display,elevation, + empty-cells,filter,float,font,font-family,font-size, + font-size-adjust,font-stretch,font-style,font-variant, + font-weight,height,ime-mode,include-source, + layer-background-color,layer-background-image,layout-flow, + layout-grid,layout-grid-char,layout-grid-char-spacing, + layout-grid-line,layout-grid-mode,layout-grid-type,left, + letter-spacing,line-break,line-height,list-style, + list-style-image,list-style-position,list-style-type,margin, + margin-bottom,margin-left,margin-right,margin-top, + marker-offset,marks,max-height,max-width,min-height, + min-width,-moz-binding,-moz-border-radius, + -moz-border-radius-topleft,-moz-border-radius-topright, + -moz-border-radius-bottomright,-moz-border-radius-bottomleft, + -moz-border-top-colors,-moz-border-right-colors, + -moz-border-bottom-colors,-moz-border-left-colors,-moz-opacity, + -moz-outline,-moz-outline-color,-moz-outline-style, + -moz-outline-width,-moz-user-focus,-moz-user-input, + -moz-user-modify,-moz-user-select,orphans,outline, + outline-color,outline-style,outline-width,overflow, + overflow-X,overflow-Y,padding,padding-bottom,padding-left, + padding-right,padding-top,page,page-break-after, + page-break-before,page-break-inside,pause,pause-after, + pause-before,pitch,pitch-range,play-during,position,quotes, + -replace,richness,right,ruby-align,ruby-overhang, + ruby-position,-set-link-source,size,speak,speak-header, + speak-numeral,speak-punctuation,speech-rate,stress, + scrollbar-arrow-color,scrollbar-base-color, + scrollbar-dark-shadow-color,scrollbar-face-color, + scrollbar-highlight-color,scrollbar-shadow-color, + scrollbar-3d-light-color,scrollbar-track-color,table-layout, + text-align,text-align-last,text-decoration,text-indent, + text-justify,text-overflow,text-shadow,text-transform, + text-autospace,text-kashida-space,text-underline-position,top, + unicode-bidi,-use-link-source,vertical-align,visibility, + voice-family,volume,white-space,widows,width,word-break, + word-spacing,word-wrap,writing-mode,z-index,zoom}, + sensitive=true, + morecomment=[l]{//}, + morecomment=[s]{/*}{*/}, + morestring=[b]', + morestring=[b]", + alsoletter={:}, + alsodigit={-} + } + \lstdefinelanguage{HTML5}{ + language=html, + sensitive=true, + alsoletter={<>=-}, + otherkeywords={ + % HTML tags + <, , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + /mark, , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + />, }, + tag=[s] + } +\lstset{% + % Basic design + backgroundcolor=\color{editorGray}, + basicstyle={\small\ttfamily}, + frame=leftline, + % Line numbers + %xleftmargin={0pt}, % dysfonctionnent + numbers=left, + stepnumber=1, + firstnumber=1, + numberfirstline=true, + % Code design + keywordstyle=\color{blue}\bfseries, + commentstyle=\color{darkgray}\ttfamily, + ndkeywordstyle=\color{editorGreen}\bfseries, + stringstyle=\color{editorOcher}, + % Code + %language=HTML5, + alsodigit={.:;}, + tabsize=2, + showtabs=false, + showspaces=false, + showstringspaces=false, + extendedchars=true, + breaklines=true, +% } +% %\lstloadlanguages{Python} %\lstset{language=Python,escapechar=|} -\lstset{literate= - {á}{{\'a}}1 {é}{{\'e}}1 {í}{{\'i}}1 {ó}{{\'o}}1 {ú}{{\'u}}1 - {Á}{{\'A}}1 {É}{{\'E}}1 {Í}{{\'I}}1 {Ó}{{\'O}}1 {Ú}{{\'U}}1 - {à}{{\`a}}1 {è}{{\`e}}1 {ì}{{\`i}}1 {ò}{{\`o}}1 {ù}{{\`u}}1 - {À}{{\`A}}1 {È}{{\'E}}1 {Ì}{{\`I}}1 {Ò}{{\`O}}1 {Ù}{{\`U}}1 - {ä}{{\"a}}1 {ë}{{\"e}}1 {ï}{{\"i}}1 {ö}{{\"o}}1 {ü}{{\"u}}1 - {Ä}{{\"A}}1 {Ë}{{\"E}}1 {Ï}{{\"I}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1 - {â}{{\^a}}1 {ê}{{\^e}}1 {î}{{\^i}}1 {ô}{{\^o}}1 {û}{{\^u}}1 - {Â}{{\^A}}1 {Ê}{{\^E}}1 {Î}{{\^I}}1 {Ô}{{\^O}}1 {Û}{{\^U}}1 - {œ}{{\oe}}1 {Œ}{{\OE}}1 {æ}{{\ae}}1 {Æ}{{\AE}}1 {ß}{{\ss}}1 - {ű}{{\H{u}}}1 {Ű}{{\H{U}}}1 {ő}{{\H{o}}}1 {Ő}{{\H{O}}}1 - {ç}{{\c c}}1 {Ç}{{\c C}}1 {ø}{{\o}}1 {å}{{\r a}}1 {Å}{{\r A}}1 - {€}{{\EUR}}1 {£}{{\pounds}}1 +%\lstset{ +literate= + {á}{{\'a}}1 {é}{{\'e}}1 {í}{{\'i}}1 {ó}{{\'o}}1 {ú}{{\'u}}1 + {Á}{{\'A}}1 {É}{{\'E}}1 {Í}{{\'I}}1 {Ó}{{\'O}}1 {Ú}{{\'U}}1 + {à}{{\`a}}1 {è}{{\`e}}1 {ì}{{\`i}}1 {ò}{{\`o}}1 {ù}{{\`u}}1 + {À}{{\`A}}1 {È}{{\'E}}1 {Ì}{{\`I}}1 {Ò}{{\`O}}1 {Ù}{{\`U}}1 + {ä}{{\"a}}1 {ë}{{\"e}}1 {ï}{{\"i}}1 {ö}{{\"o}}1 {ü}{{\"u}}1 + {Ä}{{\"A}}1 {Ë}{{\"E}}1 {Ï}{{\"I}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1 + {â}{{\^a}}1 {ê}{{\^e}}1 {î}{{\^i}}1 {ô}{{\^o}}1 {û}{{\^u}}1 + {Â}{{\^A}}1 {Ê}{{\^E}}1 {Î}{{\^I}}1 {Ô}{{\^O}}1 {Û}{{\^U}}1 + {œ}{{\oe}}1 {Œ}{{\OE}}1 {æ}{{\ae}}1 {Æ}{{\AE}}1 {ß}{{\ss}}1 + {ű}{{\H{u}}}1 {Ű}{{\H{U}}}1 {ő}{{\H{o}}}1 {Ő}{{\H{O}}}1 + {ç}{{\c c}}1 {Ç}{{\c C}}1 {ø}{{\o}}1 {å}{{\r a}}1 {Å}{{\r A}}1 + {€}{{\EUR}}1 {£}{{\pounds}}1, + escapeinside={(*@}{@*)}, + backgroundcolor=\color{lightgray!20!white} } % Unités et graphes @@ -106,6 +397,9 @@ % Couleurs \usepackage{color} % Couleurs \usepackage{xcolor} + \definecolor{editorGray}{rgb}{0.95, 0.95, 0.95} + \definecolor{editorOcher}{rgb}{1, 0.5, 0} % #FF7F00 -> rgb(239, 169, 0) + \definecolor{editorGreen}{rgb}{0, 0.5, 0} % #007C00 -> rgb(0, 124, 0) % Environnements particuliers %\usepackage[hyphens]{url} % Urls diff --git a/main-gnuplottex-fig1.eps b/main-gnuplottex-fig1.eps index afc1e27..086fc42 100644 --- a/main-gnuplottex-fig1.eps +++ b/main-gnuplottex-fig1.eps @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 -%%Title: main-gnuplottex-fig1.tex -%%Creator: gnuplot 5.2 patchlevel 6 -%%CreationDate: Fri Jan 7 19:17:38 2022 +%%Title: ./main-gnuplottex-fig1.tex +%%Creator: gnuplot 5.4 patchlevel 1 +%%CreationDate: Thu Jun 22 21:18:56 2023 %%DocumentFonts: %%BoundingBox: 50 50 410 302 %%EndComments @@ -436,12 +436,12 @@ systemdict /pdfmark known not { userdict /pdfmark systemdict /cleartomark get put } if SDict begin [ - /Title (main-gnuplottex-fig1.tex) + /Title (./main-gnuplottex-fig1.tex) /Subject (gnuplot plot) - /Creator (gnuplot 5.2 patchlevel 6) + /Creator (gnuplot 5.4 patchlevel 1) % /Producer (gnuplot) % /Keywords () - /CreationDate (Fri Jan 7 19:17:38 2022) + /CreationDate (Thu Jun 22 21:18:56 2023) /DOCINFO pdfmark end } ifelse @@ -628,6 +628,12 @@ LTb 62 0 V -62 411 R 62 0 V +1.000 UP +stroke +LTb +LCb setrgbcolor +[] 0 setdash +0.58 0.00 0.83 C 1478 3790 Box 2011 3585 Box 2543 3790 Box diff --git a/main-gnuplottex-fig1.tex b/main-gnuplottex-fig1.tex index d4db776..460af98 100644 --- a/main-gnuplottex-fig1.tex +++ b/main-gnuplottex-fig1.tex @@ -96,13 +96,13 @@ }% \gplgaddtomacro\gplfronttext{% \csname LTb\endcsname%% - \put(198,2761){\rotatebox{-270}{\makebox(0,0){\strut{}Période (puls)}}}% + \put(209,2761){\rotatebox{-270}{\makebox(0,0){\strut{}Période (puls)}}}% \put(3874,154){\makebox(0,0){\strut{}Masse (\si{\gram})}}% \csname LTb\endcsname%% \put(1078,877){\makebox(0,0)[l]{\strut{}Petites masses}}% }% \gplbacktext - \put(0,0){\includegraphics{main-gnuplottex-fig1}}% + \put(0,0){\includegraphics[width={360.00bp},height={252.00bp}]{./main-gnuplottex-fig1}}% \gplfronttext \end{picture}% \endgroup diff --git a/main.gnuploterrors b/main.gnuploterrors index a4f2982..e69de29 100644 --- a/main.gnuploterrors +++ b/main.gnuploterrors @@ -1 +0,0 @@ -sh: 1: gnuplot: not found diff --git a/main.pdf b/main.pdf index 6b0e90b..e7ca520 100644 Binary files a/main.pdf and b/main.pdf differ diff --git a/main.tex.bak b/main.tex.bak index 58aec35..8d3e0b4 100644 --- a/main.tex.bak +++ b/main.tex.bak @@ -162,7 +162,7 @@ title={\lesressourcesenligne}] % Toutes les ressources, même non citées \nocite{*} \printbibliography[heading=subbibliography,heading=subbibintoc,notcategory=cited, -title={Références non citées}]\label{refnon} +title={Références non citées}]\label{refnoncite} %\cleartooddpage