From 63f3835236b0a2a34fde53ab92768040960cf670 Mon Sep 17 00:00:00 2001 From: ppizarror Date: Fri, 9 Jul 2021 22:28:58 -0400 Subject: [PATCH] Version 4.2.7 --- example.tex | 2 +- main.tex | 4 +- src/cfg/init.tex | 37 ++++++--- src/cfg/page.tex | 2 +- src/cmd/control.tex | 2 +- src/cmd/core.tex | 2 +- src/cmd/equation.tex | 2 +- src/cmd/image.tex | 2 +- src/cmd/math.tex | 2 +- src/cmd/other.tex | 2 +- src/cmd/title.tex | 2 +- src/config.tex | 6 +- src/env/imports.tex | 6 +- src/etc/example.tex | 2 +- src/style/code.tex | 128 +++---------------------------- src/style/color.tex | 2 +- src/style/other.tex | 2 +- template.tex | 175 ++++++++++++------------------------------- template_config.tex | 6 +- 19 files changed, 108 insertions(+), 278 deletions(-) diff --git a/example.tex b/example.tex index 37cd577..95b4c9f 100644 --- a/example.tex +++ b/example.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Archivo de ejemplo -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. diff --git a/main.tex b/main.tex index 8bb2eb6..988c0ad 100644 --- a/main.tex +++ b/main.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Archivo principal -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. @@ -27,7 +27,7 @@ \def\departamentouniversidad {Departamento de la Universidad} \def\imagendepartamento {departamentos/fcfm} \def\imagendepartamentoparams {height=1.75cm} -\def\localizacionuniversidad {Santiago, Chile} +\def\localizacionuniversidad {Santiago de Chile} % EQUIPO DOCENTE \def\equipodocente { diff --git a/src/cfg/init.tex b/src/cfg/init.tex index 92cf04b..7eeba38 100644 --- a/src/cfg/init.tex +++ b/src/cfg/init.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Configuración inicial del template -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. @@ -11,9 +11,7 @@ % Sitio web: [https://latex.ppizarror.com/controles] % Licencia MIT: [https://opensource.org/licenses/MIT] -% ----------------------------------------------------------------------------- % Se revisa si las variables no han sido borradas -% ----------------------------------------------------------------------------- \checkvardefined{\autordeldocumento} \checkvardefined{\codigodelcurso} \checkvardefined{\departamentouniversidad} @@ -115,15 +113,15 @@ Template.Autor.Nombre={Pablo Pizarro R.}, Template.Autor.Web={https://ppizarror.com}, Template.Codificacion={UTF-8}, - Template.Fecha={24/06/2021}, + Template.Fecha={09/07/2021}, Template.Latex.Compilador={pdflatex}, Template.Licencia.Tipo={MIT}, Template.Licencia.Web={https://opensource.org/licenses/MIT}, Template.Nombre={Template-Controles}, Template.Tipo={Normal}, - Template.Version.Dev={4.2.6-CTR/EXM}, - Template.Version.Hash={923F57D088312F7855098404B8069A10}, - Template.Version.Release={4.2.6}, + Template.Version.Dev={4.2.7-CTR/EXM}, + Template.Version.Hash={9B47C2E159A7F733D9C632889F5D2241}, + Template.Version.Release={4.2.7}, Template.Web.Dev={https://github.com/Template-Latex/Template-Controles}, Template.Web.Manual={https://latex.ppizarror.com/controles}, Universidad.Departamento={\pdfmetainfounidepto}, @@ -135,7 +133,7 @@ pdfmenubar={\cfgpdfmenubar}, pdfpagelayout={\cfgpdflayout}, pdfpagemode={\cfgpdfpagemode}, - pdfproducer={Template-Controles v4.2.6 | (Pablo Pizarro R.) ppizarror.com}, + pdfproducer={Template-Controles v4.2.7 | (Pablo Pizarro R.) ppizarror.com}, pdfremotestartview={Fit}, pdfstartpage={1}, pdfstartview={\cfgpdfpageview}, @@ -670,10 +668,31 @@ % ----------------------------------------------------------------------------- % Formato de columnas % ----------------------------------------------------------------------------- +% Centrado \newcolumntype{C}[1]{>{\centering\let\newline\\\arraybackslash\hspace{0pt}}m{#1}} +\newcolumntype{\CColor}[2]{>{\columncolor{#1}\centering\let\newline\\\arraybackslash\hspace{0pt}}m{#2}} + +\newcolumntype{P}[1]{>{\centering\let\newline\\\arraybackslash\hspace{0pt}}p{#1}} +\newcolumntype{\PColor}[2]{>{\columncolor{#1}\centering\let\newline\\\arraybackslash\hspace{0pt}}p{#2}} + +\newcolumntype{B}[1]{>{\centering\let\newline\\\arraybackslash\hspace{0pt}}b{#1}} +\newcolumntype{\BColor}[2]{>{\columncolor{#1}\centering\let\newline\\\arraybackslash\hspace{0pt}}b{#2}} + +% Izquierda \newcolumntype{L}[1]{>{\raggedright\let\newline\\\arraybackslash\hspace{0pt}}m{#1}} -\newcolumntype{P}[1]{>{\centering\arraybackslash}p{#1}} +\newcolumntype{\LColor}[2]{>{\columncolor{#1}\raggedright\let\newline\\\arraybackslash\hspace{0pt}}m{#2}} +\newcolumntype{T}[1]{>{\raggedright\let\newline\\\arraybackslash\hspace{0pt}}p{#1}} +\newcolumntype{\TColor}[2]{>{\columncolor{#1}\raggedright\let\newline\\\arraybackslash\hspace{0pt}}p{#2}} +\newcolumntype{F}[1]{>{\raggedright\let\newline\\\arraybackslash\hspace{0pt}}b{#1}} +\newcolumntype{\FColor}[2]{>{\columncolor{#1}\raggedright\let\newline\\\arraybackslash\hspace{0pt}}b{#2}} + +% Derecha \newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}m{#1}} +\newcolumntype{\RColor}[2]{>{\columncolor{#1}\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}m{#2}} +\newcolumntype{H}[1]{>{\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}p{#1}} +\newcolumntype{\HColor}[2]{>{\columncolor{#1}\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}p{#2}} +\newcolumntype{G}[1]{>{\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}b{#1}} +\newcolumntype{\GColor}[2]{>{\columncolor{#1}\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}b{#2}} % ----------------------------------------------------------------------------- % Parcha el entorno multicols diff --git a/src/cfg/page.tex b/src/cfg/page.tex index 46b09f6..2bea8b6 100644 --- a/src/cfg/page.tex +++ b/src/cfg/page.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Configuración de página -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. diff --git a/src/cmd/control.tex b/src/cmd/control.tex index bbd28d9..fc51799 100644 --- a/src/cmd/control.tex +++ b/src/cmd/control.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Funciones exclusivas de Template-Controles -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. diff --git a/src/cmd/core.tex b/src/cmd/core.tex index 56ff389..e4d7b74 100644 --- a/src/cmd/core.tex +++ b/src/cmd/core.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Funciones del núcleo del template -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. diff --git a/src/cmd/equation.tex b/src/cmd/equation.tex index 9f71988..9879528 100644 --- a/src/cmd/equation.tex +++ b/src/cmd/equation.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Funciones para insertar ecuaciones -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. diff --git a/src/cmd/image.tex b/src/cmd/image.tex index 2ab76f7..31919fa 100644 --- a/src/cmd/image.tex +++ b/src/cmd/image.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Funciones para insertar imágenes -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. diff --git a/src/cmd/math.tex b/src/cmd/math.tex index 737a4a6..d069449 100644 --- a/src/cmd/math.tex +++ b/src/cmd/math.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Funciones matemáticas -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. diff --git a/src/cmd/other.tex b/src/cmd/other.tex index 9d8b6dc..f14d226 100644 --- a/src/cmd/other.tex +++ b/src/cmd/other.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Funciones para insertar elementos -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. diff --git a/src/cmd/title.tex b/src/cmd/title.tex index b9ee539..f7974b5 100644 --- a/src/cmd/title.tex +++ b/src/cmd/title.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Funciones para insertar títulos -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. diff --git a/src/config.tex b/src/config.tex index be15a25..54b1ebd 100644 --- a/src/config.tex +++ b/src/config.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Configuraciones del template -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. @@ -128,8 +128,8 @@ \def\sourcecodenumbersep {6} % Separación entre número línea y código [pt] \def\sourcecodetabsize {3} % Tamaño tabulación código fuente \def\tabledefaultplacement {H} % Posición por defecto de las tablas -\def\tablepaddingh {0.85} % Espaciado horizontal de celda de las tablas -\def\tablepaddingv {1.05} % Espaciado vertical de celda de las tablas +\def\tablepaddingh {0.75} % Espaciado horizontal de celda de las tablas +\def\tablepaddingv {1.15} % Espaciado vertical de celda de las tablas \def\tikzdefaultplacement {H} % Posición por defecto de las figuras tikz % CONFIGURACIÓN DE LOS TÍTULOS diff --git a/src/env/imports.tex b/src/env/imports.tex index a1a9181..b1c72b2 100644 --- a/src/env/imports.tex +++ b/src/env/imports.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Importación de librerías -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. @@ -11,9 +11,7 @@ % Sitio web: [https://latex.ppizarror.com/controles] % Licencia MIT: [https://opensource.org/licenses/MIT] -% ----------------------------------------------------------------------------- -% SE GUARDAN VARIABLES ANTES DE CARGAR LIBRERÍAS -% ----------------------------------------------------------------------------- +% Se guardan variables antes de cargar librerías \let\RE\Re \let\IM\Im diff --git a/src/etc/example.tex b/src/etc/example.tex index 37cd577..95b4c9f 100644 --- a/src/etc/example.tex +++ b/src/etc/example.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Archivo de ejemplo -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. diff --git a/src/style/code.tex b/src/style/code.tex index 8e9fdb9..6c15d2f 100644 --- a/src/style/code.tex +++ b/src/style/code.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Estilos de código fuente -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. @@ -11,9 +11,7 @@ % Sitio web: [https://latex.ppizarror.com/controles] % Licencia MIT: [https://opensource.org/licenses/MIT] -% ----------------------------------------------------------------------------- % Assembler -% ----------------------------------------------------------------------------- \lstdefinelanguage[x64]{Assembler}[x86masm]{Assembler}{ morekeywords={ CDQE,CQO,CMPSQ,CMPXCHG16B,JRCXZ,LODSQ,MOVSXD,POPFQ,PUSHFQ,SCASQ,STOSQ,IRETQ,RDTSCP,SWAPGS,rax,rdx,rcx,rbx,rsi,rdi,rsp,rbp,r8,r8d,r8w,r8b,r9,r9d,r9w,r9b,r10,r10d,r10w,r10b,r11,r11d,r11w,r11b,r12,r12d,r12w,r12b,r13,r13d,r13w,r13b,r14,r14d,r14w,r14b,r15,r15d,r15w,r15b @@ -26,9 +24,7 @@ language=[x86masm]Assembler } -% ----------------------------------------------------------------------------- % Bash -% ----------------------------------------------------------------------------- \lstdefinestyle{bash}{ language=bash, breakatwhitespace=false, @@ -40,41 +36,31 @@ sensitive=false } -% ----------------------------------------------------------------------------- % Basic -% ----------------------------------------------------------------------------- \lstdefinestyle{basic}{ language=[Visual]Basic } -% ----------------------------------------------------------------------------- % C -% ----------------------------------------------------------------------------- \lstdefinestyle{c}{ language=C, breakatwhitespace=false, keepspaces=true } -% ----------------------------------------------------------------------------- % Cobol -% ----------------------------------------------------------------------------- \lstdefinestyle{cobol}{ language=Cobol } -% ----------------------------------------------------------------------------- % C++ -% ----------------------------------------------------------------------------- \lstdefinestyle{cpp}{ language=C++, breakatwhitespace=false, morecomment=[l][\color{magenta}]{\#} } -% ----------------------------------------------------------------------------- % C# -% ----------------------------------------------------------------------------- \lstdefinestyle{csharp}{ language=csh, morecomment=[l]{//}, @@ -84,9 +70,7 @@ } } -% ----------------------------------------------------------------------------- % CSS -% ----------------------------------------------------------------------------- \lstdefinelanguage{CSS}{ morecomment=[s]{/*}{*/}, morekeywords={ @@ -100,16 +84,12 @@ breakatwhitespace=true } -% ----------------------------------------------------------------------------- % CSV, Archivos separados por coma -% ----------------------------------------------------------------------------- \lstdefinestyle{csv}{ language={} } -% ----------------------------------------------------------------------------- % CUDA -% ----------------------------------------------------------------------------- \lstdefinestyle{cuda}{ language=C++, breakatwhitespace=false, @@ -121,9 +101,7 @@ moredelim=[s][\ttfamily]{<<<}{>>>} } -% ----------------------------------------------------------------------------- % DOCKER -% ----------------------------------------------------------------------------- \lstdefinelanguage{docker}{ comment=[l]{\#}, keywords={ @@ -137,17 +115,13 @@ breakatwhitespace=true } -% ----------------------------------------------------------------------------- % Fortran-95 -% ----------------------------------------------------------------------------- \lstdefinestyle{fortran}{ language=[95]Fortran, breakatwhitespace=false } -% ----------------------------------------------------------------------------- % GLSL - Shaders -% ----------------------------------------------------------------------------- \lstdefinelanguage{GLSL}{ alsoletter={\#}, morekeywords=[1]{ @@ -170,31 +144,23 @@ upquote=true } -% ----------------------------------------------------------------------------- % Gnuplot -% ----------------------------------------------------------------------------- \lstdefinestyle{gnuplot}{ language=Gnuplot } -% ----------------------------------------------------------------------------- % Go -% ----------------------------------------------------------------------------- \lstdefinestyle{go}{ language=Go } -% ----------------------------------------------------------------------------- % Haskell -% ----------------------------------------------------------------------------- \lstdefinestyle{haskell}{ language=haskell, morecomment=[l]\% } -% ----------------------------------------------------------------------------- % HTML5 -% ----------------------------------------------------------------------------- \lstdefinelanguage{HTML5}{ language=html, alsoletter={<>=-}, @@ -202,9 +168,9 @@ ndkeywords={ % General =, - % HTML attributes + % Atributos HTML accept=,accept-charset=,accesskey=,action=,align=,alt=,async=,autocomplete=,autofocus=,autoplay=,autosave=,bgcolor=,border=,buffered=,challenge=,charset=,checked=,cite=,class=,code=,codebase=,color=,cols=,colspan=,content=,contenteditable=,contextmenu=,controls=,coords=,data=,datetime=,default=,defer=,dir=,dirname=,disabled=,download=,draggable=,dropzone=,enctype=,for=,form=,formaction=,headers=,height=,hidden=,high=,href=,hreflang=,http-equiv=,icon=,id=,ismap=,itemprop=,keytype=,kind=,label=,lang=,language=,list=,loop=,low=,manifest=,max=,maxlength=,media=,method=,min=,multiple=,name=,novalidate=,open=,optimum=,pattern=,ping=,placeholder=,poster=,preload=,pubdate=,radiogroup=,readonly=,rel=,required=,reversed=,rows=,rowspan=,sandbox=,scope=,scoped=,seamless=,selected=,shape=,size=,sizes=,span=,spellcheck=,src=,srcdoc=,srclang=,start=,step=,style=,summary=,tabindex=,target=,title=,type=,usemap=,value=,width=,wrap=, - % CSSproperties + % Propiedades CSS 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:,transition-duration:,transition-property:,transition-timing-function:,transform:,-moz-transform:,-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: }, otherkeywords={ @@ -222,9 +188,7 @@ numberfirstline=true } -% ----------------------------------------------------------------------------- % INI, Archivos de configuraciones -% ----------------------------------------------------------------------------- \lstdefinestyle{ini}{ language={}, commentstyle=\color{gray}\ttfamily, @@ -236,18 +200,14 @@ otherkeywords={=,:} } -% ----------------------------------------------------------------------------- % Java -% ----------------------------------------------------------------------------- \lstdefinestyle{java}{ language=Java, breakatwhitespace=true, keepspaces=true } -% ----------------------------------------------------------------------------- % Javascript -% ----------------------------------------------------------------------------- \lstdefinelanguage{JavaScript}{ comment=[l]{//}, keepspaces=true, @@ -271,9 +231,7 @@ language=JavaScript } -% ----------------------------------------------------------------------------- % JSON -% ----------------------------------------------------------------------------- \lstdefinestyle{json}{ literate=*{0}{{{\color{numb}0}}}{1}{1}{{{\color{numb}1}}}{1}{2} {{{\color{numb}2}}}{1}{3}{{{\color{numb}3}}}{1}{4}{{{\color{numb}4}}} @@ -285,9 +243,7 @@ tabsize=2 } -% ----------------------------------------------------------------------------- % Kotlin -% ----------------------------------------------------------------------------- \lstdefinestyle{kotlin}{ comment=[l]{//}, emph={delegate,filter,first,firstOrNull,forEach,lazy,map,mapNotNull,println, @@ -306,9 +262,7 @@ sensitive=true } -% ----------------------------------------------------------------------------- % LaTeX -% ----------------------------------------------------------------------------- \lstdefinestyle{latex}{ language=TeX, morekeywords={ @@ -316,24 +270,18 @@ } } -% ----------------------------------------------------------------------------- % Lisp -% ----------------------------------------------------------------------------- \lstdefinestyle{lisp}{ language=Lisp, morekeywords={if} } -% ----------------------------------------------------------------------------- % Lua -% ----------------------------------------------------------------------------- \lstdefinestyle{lua}{ language={[5.2]Lua} } -% ----------------------------------------------------------------------------- % Maple -% ----------------------------------------------------------------------------- \lstdefinelanguage{Maple}{ morecomment=[l]\#, morekeywords={ @@ -347,16 +295,12 @@ language=Maple } -% ----------------------------------------------------------------------------- % Mathematica -% ----------------------------------------------------------------------------- \lstdefinestyle{mathematica}{ language=Mathematica } -% ----------------------------------------------------------------------------- % Matlab -% ----------------------------------------------------------------------------- \lstdefinestyle{matlab}{ language=Matlab, deletekeywords={fft}, @@ -368,9 +312,7 @@ } } -% ----------------------------------------------------------------------------- % Octave -% ----------------------------------------------------------------------------- \lstdefinestyle{octave}{ language=Octave, keepspaces=true, @@ -378,9 +320,7 @@ morecomment=[n]{\%\{\^^M}{\%\}\^^M} } -% ----------------------------------------------------------------------------- % OpenCL -% ----------------------------------------------------------------------------- \lstdefinestyle{opencl}{ language=C++, breakatwhitespace=false, @@ -391,9 +331,7 @@ morecomment=[l][\color{magenta}]{\#} } -% ----------------------------------------------------------------------------- % OpenSees -% ----------------------------------------------------------------------------- \lstdefinestyle{opensees}{ language=tcl, breakatwhitespace=false, @@ -401,7 +339,6 @@ -accel,-beamUniform,-dir,-dof,-ele,-eleRange,-file,-height,-increment,-initial,-iNode,-integration,-iterate,-jNode,-kNode,-mass,-mat,-matConcrete,-matShear,-matSteel,-max,-maxDim,-maxEta,-maxIter,-min,-minEta,-ndf,-ndm,-node,-nodeRange,-numSublevels,-numSubSteps,-perpDirn,-region,-rho,-sections,-thick,-time,-tol,-type,-width }, emphstyle=[1]\color{black}\bfseries\em, - % moredelim=[s][\color{black}\bfseries\em]{-}{\ }, keepspaces=true, morecomment=[l]{\#}, morekeywords={ @@ -413,18 +350,14 @@ ndkeywordstyle=\color{dkcyan}\ttfamily } -% ----------------------------------------------------------------------------- % Pascal -% ----------------------------------------------------------------------------- \lstdefinestyle{pascal}{ language=Pascal, morecomment=[l]{//}, sensitive=false } -% ----------------------------------------------------------------------------- % Perl -% ----------------------------------------------------------------------------- \lstdefinestyle{perl}{ language=Perl, alsoletter={\%}, @@ -432,9 +365,7 @@ keepspaces=true } -% ----------------------------------------------------------------------------- % PHP -% ----------------------------------------------------------------------------- \lstdefinestyle{php}{ language=php, emph=[1]{ @@ -455,9 +386,7 @@ upquote=true } -% ----------------------------------------------------------------------------- % Texto plano -% ----------------------------------------------------------------------------- \lstdefinestyle{plaintext}{ language={}, keepspaces=true, @@ -465,17 +394,13 @@ tabsize=4 } -% ----------------------------------------------------------------------------- % Postscript -% ----------------------------------------------------------------------------- \lstdefinestyle{postscript}{ language=PostScript, keepspaces=true } -% ----------------------------------------------------------------------------- % Pseudocódigo -% ----------------------------------------------------------------------------- \lstdefinestyle{pseudocode}{ language={}, backgroundcolor=\color{white}, @@ -496,9 +421,7 @@ stringstyle=\color{dkgray}\bfseries\em } -% ----------------------------------------------------------------------------- % Python -% ----------------------------------------------------------------------------- \lstdefinelanguage{pythonEXTENDED}{ language=Python, breakatwhitespace=false, @@ -519,9 +442,7 @@ language=pythonEXTENDED } -% ----------------------------------------------------------------------------- % R -% ----------------------------------------------------------------------------- \lstdefinestyle{r}{ language=R, alsoletter={.<-}, @@ -537,9 +458,7 @@ } } -% ----------------------------------------------------------------------------- % Racket -% ----------------------------------------------------------------------------- \lstdefinestyle{racket}{ alsoletter={',`,-,/,>,<,\#,\%}, morekeywords=[1]{ @@ -560,9 +479,7 @@ } -% ----------------------------------------------------------------------------- % Ruby -% ----------------------------------------------------------------------------- \lstdefinestyle{ruby}{ language=Ruby, breakatwhitespace=true, @@ -571,14 +488,7 @@ sensitive=true } -% ----------------------------------------------------------------------------- % Rust -% [1] Reserve keywords -% [2] Traits -% [3] Primitive types -% [4] Type and value constructors -% [5] Identifier -% ----------------------------------------------------------------------------- \lstdefinelanguage{Rust}{ sensitive, alsodigit={}, @@ -587,22 +497,22 @@ morecomment=[l]{//}, morecomment=[s]{/*}{*/}, moredelim=[s][{\itshape\color[rgb]{0,0,0.75}}]{\#[}{]}, - morekeywords=[2]{ + morekeywords=[2]{ % Traits Add,AddAssign,Any,AsciiExt,AsInner,AsInnerMut,AsMut,AsRawFd,AsRawHandle,AsRawSocket,AsRef,Binary,BitAnd,BitAndAssign,Bitor,BitOr,BitOrAssign,BitXor,BitXorAssign,Borrow,BorrowMut,Boxed,BoxPlace,BufRead,BuildHasher,CastInto,CharExt,Clone,CoerceUnsized,CommandExt,Copy,Debug,DecodableFloat,Default,Deref,DerefMut,DirBuilderExt,DirEntryExt,Display,Div,DivAssign,DoubleEndedIterator,DoubleEndedSearcher,Drop,EnvKey,Eq,Error,ExactSizeIterator,ExitStatusExt,Extend,FileExt,FileTypeExt,Float,Fn,FnBox,FnMut,FnOnce,Freeze,From,FromInner,FromIterator,FromRawFd,FromRawHandle,FromRawSocket,FromStr,FullOps,FusedIterator,Generator,Hash,Hasher,Index,IndexMut,InPlace,Int,Into,IntoCow,IntoInner,IntoIterator,IntoRawFd,IntoRawHandle,IntoRawSocket,IsMinusOne,IsZero,Iterator,JoinHandleExt,LargeInt,LowerExp,LowerHex,MetadataExt,Mul,MulAssign,Neg,Not,Octal,OpenOptionsExt,Ord,OsStrExt,OsStringExt,Packet,PartialEq,PartialOrd,Pattern,PermissionsExt,Place,Placer,Pointer,Product,Put,RangeArgument,RawFloat,Read,Rem,RemAssign,Seek,Shl,ShlAssign,Shr,ShrAssign,Sized,SliceConcatExt,SliceExt,SliceIndex,Stats,Step,StrExt,Sub,SubAssign,Sum,Sync,TDynBenchFn,Terminal,Termination,ToOwned,ToSocketAddrs,ToString,Try,TryFrom,TryInto,UnicodeStr,Unsize,UpperExp,UpperHex,WideInt,Write }, morekeywords=[2]{ Send }, - morekeywords=[3]{ + morekeywords=[3]{ % Primitivas bool,char,f32,f64,i8,i16,i32,i64,isize,str,u8,u16,u32,u64,unit,usize,i128,u128 }, - morekeywords=[4]{ + morekeywords=[4]{ % Valor y tipo de constructores Err,false,None,Ok,Some,true }, - morekeywords=[5]{ + morekeywords=[5]{ % Identificadores assert!,assert_eq!,assert_ne!,cfg!,column!,compile_error!,concat!,concat_idents!,debug_assert!,debug_assert_eq!,debug_assert_ne!,env!,eprint!,eprintln!,file!,format!,format_args!,include!,include_bytes!,include_str!,line!,module_path!,option_env!,panic!,print!,println!,select!,stringify!,thread_local!,try!,unimplemented!,unreachable!,vec!,write!,writeln! }, - morekeywords={ + morekeywords={ % Palabras reservadas abstract,alignof,become,box,do,final,macro,offsetof,override,priv, proc,pure,sizeof,typeof,unsized,virtual,yield }, morekeywords={ @@ -625,14 +535,12 @@ \lstdefinestyle{rust}{ language=Rust, keywordstyle=[2]\color[rgb]{0.75,0,0}, % Traits - keywordstyle=[3]\color[rgb]{0,0.5,0}, % Primitive types - keywordstyle=[4]\color[rgb]{0,0.5,0}, % Type and value constructors + keywordstyle=[3]\color[rgb]{0,0.5,0}, % Primitivas + keywordstyle=[4]\color[rgb]{0,0.5,0}, % Valor y tipo de constructores keywordstyle=[5]\color[rgb]{0,0,0.75} % Macros } -% ----------------------------------------------------------------------------- % Scala -% ----------------------------------------------------------------------------- \lstdefinestyle{scala}{ language=scala, breakatwhitespace=true, @@ -649,9 +557,7 @@ } } -% ----------------------------------------------------------------------------- % Scheme -% ----------------------------------------------------------------------------- \lstdefinestyle{scheme}{ language=Lisp, morecomment=[l]{;}, @@ -661,24 +567,18 @@ morestring=[b]" } -% ----------------------------------------------------------------------------- % SQL -% ----------------------------------------------------------------------------- \lstdefinestyle{sql}{ language=SQL, breakatwhitespace=true } -% ----------------------------------------------------------------------------- % Swift -% ----------------------------------------------------------------------------- \lstdefinestyle{swift}{ language=Swift } -% ----------------------------------------------------------------------------- % TCL -% ----------------------------------------------------------------------------- \lstdefinestyle{tcl}{ language=tcl, breakatwhitespace=false, @@ -686,24 +586,18 @@ morecomment=[l]{\#} } -% ----------------------------------------------------------------------------- % Visual Basic -% ----------------------------------------------------------------------------- \lstdefinestyle{vbscript}{ language=[Visual]Basic, extendedchars=true } -% ----------------------------------------------------------------------------- % Verilog -% ----------------------------------------------------------------------------- \lstdefinestyle{verilog}{ language=Verilog } -% ----------------------------------------------------------------------------- % VDHL -% ----------------------------------------------------------------------------- \lstdefinelanguage{VHDL}{ morekeywords=[1]{ ALL,all,and,architecture,begin,downto,end,entity,in,is,library,Not,of,or,out,port,use @@ -717,9 +611,7 @@ language=VHDL } -% ----------------------------------------------------------------------------- % XML -% ----------------------------------------------------------------------------- \lstdefinelanguage{XML}{ morecomment=[s]{}, morekeywords={ diff --git a/src/style/color.tex b/src/style/color.tex index 682aa29..2829974 100644 --- a/src/style/color.tex +++ b/src/style/color.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Definición de colores -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. diff --git a/src/style/other.tex b/src/style/other.tex index 5d1431c..76ee39c 100644 --- a/src/style/other.tex +++ b/src/style/other.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Otros estilos -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. diff --git a/template.tex b/template.tex index 7ced15e..15e1a40 100644 --- a/template.tex +++ b/template.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Núcleo del template -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. @@ -11,13 +11,15 @@ % Sitio web: [https://latex.ppizarror.com/controles] % Licencia MIT: [https://opensource.org/licenses/MIT] +% ----------------------------------------------------------------------------- % CONFIGURACIONES +% ----------------------------------------------------------------------------- \input{template_config} -% IMPORTACIÓN DE LIBRERÍAS % ----------------------------------------------------------------------------- -% SE GUARDAN VARIABLES ANTES DE CARGAR LIBRERÍAS +% IMPORTACIÓN DE LIBRERÍAS % ----------------------------------------------------------------------------- +% Se guardan variables antes de cargar librerías \let\RE\Re \let\IM\Im @@ -645,7 +647,9 @@ \inputencoding{utf8}}{ } +% ----------------------------------------------------------------------------- % IMPORTACIÓN DE FUNCIONES Y ENTORNOS +% ----------------------------------------------------------------------------- % Definición de variables globales \def\GLOBALcaptiondefn {EMPTY-VAR} % Definición del caption %\def\GLOBALcaptiondefnimages{EMPTY-VAR} % Definición del caption en images @@ -3222,7 +3226,9 @@ }% } +% ----------------------------------------------------------------------------- % IMPORTACIÓN DE ESTILOS +% ----------------------------------------------------------------------------- \colorlet{numb}{magenta!60!black} \colorlet{punct}{red!60!black} \definecolor{delim}{RGB}{20,105,176} @@ -3237,9 +3243,7 @@ \definecolor{mauve}{RGB}{150,0,210} \definecolor{ocre}{RGB}{243,102,25} -% ----------------------------------------------------------------------------- % Assembler -% ----------------------------------------------------------------------------- \lstdefinelanguage[x64]{Assembler}[x86masm]{Assembler}{ morekeywords={ CDQE,CQO,CMPSQ,CMPXCHG16B,JRCXZ,LODSQ,MOVSXD,POPFQ,PUSHFQ,SCASQ,STOSQ,IRETQ,RDTSCP,SWAPGS,rax,rdx,rcx,rbx,rsi,rdi,rsp,rbp,r8,r8d,r8w,r8b,r9,r9d,r9w,r9b,r10,r10d,r10w,r10b,r11,r11d,r11w,r11b,r12,r12d,r12w,r12b,r13,r13d,r13w,r13b,r14,r14d,r14w,r14b,r15,r15d,r15w,r15b @@ -3252,9 +3256,7 @@ language=[x86masm]Assembler } -% ----------------------------------------------------------------------------- % Bash -% ----------------------------------------------------------------------------- \lstdefinestyle{bash}{ language=bash, breakatwhitespace=false, @@ -3266,41 +3268,31 @@ sensitive=false } -% ----------------------------------------------------------------------------- % Basic -% ----------------------------------------------------------------------------- \lstdefinestyle{basic}{ language=[Visual]Basic } -% ----------------------------------------------------------------------------- % C -% ----------------------------------------------------------------------------- \lstdefinestyle{c}{ language=C, breakatwhitespace=false, keepspaces=true } -% ----------------------------------------------------------------------------- % Cobol -% ----------------------------------------------------------------------------- \lstdefinestyle{cobol}{ language=Cobol } -% ----------------------------------------------------------------------------- % C++ -% ----------------------------------------------------------------------------- \lstdefinestyle{cpp}{ language=C++, breakatwhitespace=false, morecomment=[l][\color{magenta}]{\#} } -% ----------------------------------------------------------------------------- % C# -% ----------------------------------------------------------------------------- \lstdefinestyle{csharp}{ language=csh, morecomment=[l]{//}, @@ -3310,9 +3302,7 @@ } } -% ----------------------------------------------------------------------------- % CSS -% ----------------------------------------------------------------------------- \lstdefinelanguage{CSS}{ morecomment=[s]{/*}{*/}, morekeywords={ @@ -3326,16 +3316,12 @@ breakatwhitespace=true } -% ----------------------------------------------------------------------------- % CSV, Archivos separados por coma -% ----------------------------------------------------------------------------- \lstdefinestyle{csv}{ language={} } -% ----------------------------------------------------------------------------- % CUDA -% ----------------------------------------------------------------------------- \lstdefinestyle{cuda}{ language=C++, breakatwhitespace=false, @@ -3347,9 +3333,7 @@ moredelim=[s][\ttfamily]{<<<}{>>>} } -% ----------------------------------------------------------------------------- % DOCKER -% ----------------------------------------------------------------------------- \lstdefinelanguage{docker}{ comment=[l]{\#}, keywords={ @@ -3363,17 +3347,13 @@ breakatwhitespace=true } -% ----------------------------------------------------------------------------- % Fortran-95 -% ----------------------------------------------------------------------------- \lstdefinestyle{fortran}{ language=[95]Fortran, breakatwhitespace=false } -% ----------------------------------------------------------------------------- % GLSL - Shaders -% ----------------------------------------------------------------------------- \lstdefinelanguage{GLSL}{ alsoletter={\#}, morekeywords=[1]{ @@ -3396,31 +3376,23 @@ upquote=true } -% ----------------------------------------------------------------------------- % Gnuplot -% ----------------------------------------------------------------------------- \lstdefinestyle{gnuplot}{ language=Gnuplot } -% ----------------------------------------------------------------------------- % Go -% ----------------------------------------------------------------------------- \lstdefinestyle{go}{ language=Go } -% ----------------------------------------------------------------------------- % Haskell -% ----------------------------------------------------------------------------- \lstdefinestyle{haskell}{ language=haskell, morecomment=[l]\% } -% ----------------------------------------------------------------------------- % HTML5 -% ----------------------------------------------------------------------------- \lstdefinelanguage{HTML5}{ language=html, alsoletter={<>=-}, @@ -3428,9 +3400,9 @@ ndkeywords={ % General =, - % HTML attributes + % Atributos HTML accept=,accept-charset=,accesskey=,action=,align=,alt=,async=,autocomplete=,autofocus=,autoplay=,autosave=,bgcolor=,border=,buffered=,challenge=,charset=,checked=,cite=,class=,code=,codebase=,color=,cols=,colspan=,content=,contenteditable=,contextmenu=,controls=,coords=,data=,datetime=,default=,defer=,dir=,dirname=,disabled=,download=,draggable=,dropzone=,enctype=,for=,form=,formaction=,headers=,height=,hidden=,high=,href=,hreflang=,http-equiv=,icon=,id=,ismap=,itemprop=,keytype=,kind=,label=,lang=,language=,list=,loop=,low=,manifest=,max=,maxlength=,media=,method=,min=,multiple=,name=,novalidate=,open=,optimum=,pattern=,ping=,placeholder=,poster=,preload=,pubdate=,radiogroup=,readonly=,rel=,required=,reversed=,rows=,rowspan=,sandbox=,scope=,scoped=,seamless=,selected=,shape=,size=,sizes=,span=,spellcheck=,src=,srcdoc=,srclang=,start=,step=,style=,summary=,tabindex=,target=,title=,type=,usemap=,value=,width=,wrap=, - % CSSproperties + % Propiedades CSS 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:,transition-duration:,transition-property:,transition-timing-function:,transform:,-moz-transform:,-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: }, otherkeywords={ @@ -3448,9 +3420,7 @@ numberfirstline=true } -% ----------------------------------------------------------------------------- % INI, Archivos de configuraciones -% ----------------------------------------------------------------------------- \lstdefinestyle{ini}{ language={}, commentstyle=\color{gray}\ttfamily, @@ -3462,18 +3432,14 @@ otherkeywords={=,:} } -% ----------------------------------------------------------------------------- % Java -% ----------------------------------------------------------------------------- \lstdefinestyle{java}{ language=Java, breakatwhitespace=true, keepspaces=true } -% ----------------------------------------------------------------------------- % Javascript -% ----------------------------------------------------------------------------- \lstdefinelanguage{JavaScript}{ comment=[l]{//}, keepspaces=true, @@ -3497,9 +3463,7 @@ language=JavaScript } -% ----------------------------------------------------------------------------- % JSON -% ----------------------------------------------------------------------------- \lstdefinestyle{json}{ literate=*{0}{{{\color{numb}0}}}{1}{1}{{{\color{numb}1}}}{1}{2} {{{\color{numb}2}}}{1}{3}{{{\color{numb}3}}}{1}{4}{{{\color{numb}4}}} @@ -3511,9 +3475,7 @@ tabsize=2 } -% ----------------------------------------------------------------------------- % Kotlin -% ----------------------------------------------------------------------------- \lstdefinestyle{kotlin}{ comment=[l]{//}, emph={delegate,filter,first,firstOrNull,forEach,lazy,map,mapNotNull,println, @@ -3532,9 +3494,7 @@ sensitive=true } -% ----------------------------------------------------------------------------- % LaTeX -% ----------------------------------------------------------------------------- \lstdefinestyle{latex}{ language=TeX, morekeywords={ @@ -3542,24 +3502,18 @@ } } -% ----------------------------------------------------------------------------- % Lisp -% ----------------------------------------------------------------------------- \lstdefinestyle{lisp}{ language=Lisp, morekeywords={if} } -% ----------------------------------------------------------------------------- % Lua -% ----------------------------------------------------------------------------- \lstdefinestyle{lua}{ language={[5.2]Lua} } -% ----------------------------------------------------------------------------- % Maple -% ----------------------------------------------------------------------------- \lstdefinelanguage{Maple}{ morecomment=[l]\#, morekeywords={ @@ -3573,16 +3527,12 @@ language=Maple } -% ----------------------------------------------------------------------------- % Mathematica -% ----------------------------------------------------------------------------- \lstdefinestyle{mathematica}{ language=Mathematica } -% ----------------------------------------------------------------------------- % Matlab -% ----------------------------------------------------------------------------- \lstdefinestyle{matlab}{ language=Matlab, deletekeywords={fft}, @@ -3594,9 +3544,7 @@ } } -% ----------------------------------------------------------------------------- % Octave -% ----------------------------------------------------------------------------- \lstdefinestyle{octave}{ language=Octave, keepspaces=true, @@ -3604,9 +3552,7 @@ morecomment=[n]{\%\{\^^M}{\%\}\^^M} } -% ----------------------------------------------------------------------------- % OpenCL -% ----------------------------------------------------------------------------- \lstdefinestyle{opencl}{ language=C++, breakatwhitespace=false, @@ -3617,9 +3563,7 @@ morecomment=[l][\color{magenta}]{\#} } -% ----------------------------------------------------------------------------- % OpenSees -% ----------------------------------------------------------------------------- \lstdefinestyle{opensees}{ language=tcl, breakatwhitespace=false, @@ -3627,7 +3571,6 @@ -accel,-beamUniform,-dir,-dof,-ele,-eleRange,-file,-height,-increment,-initial,-iNode,-integration,-iterate,-jNode,-kNode,-mass,-mat,-matConcrete,-matShear,-matSteel,-max,-maxDim,-maxEta,-maxIter,-min,-minEta,-ndf,-ndm,-node,-nodeRange,-numSublevels,-numSubSteps,-perpDirn,-region,-rho,-sections,-thick,-time,-tol,-type,-width }, emphstyle=[1]\color{black}\bfseries\em, - % moredelim=[s][\color{black}\bfseries\em]{-}{\ }, keepspaces=true, morecomment=[l]{\#}, morekeywords={ @@ -3639,18 +3582,14 @@ ndkeywordstyle=\color{dkcyan}\ttfamily } -% ----------------------------------------------------------------------------- % Pascal -% ----------------------------------------------------------------------------- \lstdefinestyle{pascal}{ language=Pascal, morecomment=[l]{//}, sensitive=false } -% ----------------------------------------------------------------------------- % Perl -% ----------------------------------------------------------------------------- \lstdefinestyle{perl}{ language=Perl, alsoletter={\%}, @@ -3658,9 +3597,7 @@ keepspaces=true } -% ----------------------------------------------------------------------------- % PHP -% ----------------------------------------------------------------------------- \lstdefinestyle{php}{ language=php, emph=[1]{ @@ -3681,9 +3618,7 @@ upquote=true } -% ----------------------------------------------------------------------------- % Texto plano -% ----------------------------------------------------------------------------- \lstdefinestyle{plaintext}{ language={}, keepspaces=true, @@ -3691,17 +3626,13 @@ tabsize=4 } -% ----------------------------------------------------------------------------- % Postscript -% ----------------------------------------------------------------------------- \lstdefinestyle{postscript}{ language=PostScript, keepspaces=true } -% ----------------------------------------------------------------------------- % Pseudocódigo -% ----------------------------------------------------------------------------- \lstdefinestyle{pseudocode}{ language={}, backgroundcolor=\color{white}, @@ -3722,9 +3653,7 @@ stringstyle=\color{dkgray}\bfseries\em } -% ----------------------------------------------------------------------------- % Python -% ----------------------------------------------------------------------------- \lstdefinelanguage{pythonEXTENDED}{ language=Python, breakatwhitespace=false, @@ -3745,9 +3674,7 @@ language=pythonEXTENDED } -% ----------------------------------------------------------------------------- % R -% ----------------------------------------------------------------------------- \lstdefinestyle{r}{ language=R, alsoletter={.<-}, @@ -3763,9 +3690,7 @@ } } -% ----------------------------------------------------------------------------- % Racket -% ----------------------------------------------------------------------------- \lstdefinestyle{racket}{ alsoletter={',`,-,/,>,<,\#,\%}, morekeywords=[1]{ @@ -3786,9 +3711,7 @@ } -% ----------------------------------------------------------------------------- % Ruby -% ----------------------------------------------------------------------------- \lstdefinestyle{ruby}{ language=Ruby, breakatwhitespace=true, @@ -3797,14 +3720,7 @@ sensitive=true } -% ----------------------------------------------------------------------------- % Rust -% [1] Reserve keywords -% [2] Traits -% [3] Primitive types -% [4] Type and value constructors -% [5] Identifier -% ----------------------------------------------------------------------------- \lstdefinelanguage{Rust}{ sensitive, alsodigit={}, @@ -3813,22 +3729,22 @@ morecomment=[l]{//}, morecomment=[s]{/*}{*/}, moredelim=[s][{\itshape\color[rgb]{0,0,0.75}}]{\#[}{]}, - morekeywords=[2]{ + morekeywords=[2]{ % Traits Add,AddAssign,Any,AsciiExt,AsInner,AsInnerMut,AsMut,AsRawFd,AsRawHandle,AsRawSocket,AsRef,Binary,BitAnd,BitAndAssign,Bitor,BitOr,BitOrAssign,BitXor,BitXorAssign,Borrow,BorrowMut,Boxed,BoxPlace,BufRead,BuildHasher,CastInto,CharExt,Clone,CoerceUnsized,CommandExt,Copy,Debug,DecodableFloat,Default,Deref,DerefMut,DirBuilderExt,DirEntryExt,Display,Div,DivAssign,DoubleEndedIterator,DoubleEndedSearcher,Drop,EnvKey,Eq,Error,ExactSizeIterator,ExitStatusExt,Extend,FileExt,FileTypeExt,Float,Fn,FnBox,FnMut,FnOnce,Freeze,From,FromInner,FromIterator,FromRawFd,FromRawHandle,FromRawSocket,FromStr,FullOps,FusedIterator,Generator,Hash,Hasher,Index,IndexMut,InPlace,Int,Into,IntoCow,IntoInner,IntoIterator,IntoRawFd,IntoRawHandle,IntoRawSocket,IsMinusOne,IsZero,Iterator,JoinHandleExt,LargeInt,LowerExp,LowerHex,MetadataExt,Mul,MulAssign,Neg,Not,Octal,OpenOptionsExt,Ord,OsStrExt,OsStringExt,Packet,PartialEq,PartialOrd,Pattern,PermissionsExt,Place,Placer,Pointer,Product,Put,RangeArgument,RawFloat,Read,Rem,RemAssign,Seek,Shl,ShlAssign,Shr,ShrAssign,Sized,SliceConcatExt,SliceExt,SliceIndex,Stats,Step,StrExt,Sub,SubAssign,Sum,Sync,TDynBenchFn,Terminal,Termination,ToOwned,ToSocketAddrs,ToString,Try,TryFrom,TryInto,UnicodeStr,Unsize,UpperExp,UpperHex,WideInt,Write }, morekeywords=[2]{ Send }, - morekeywords=[3]{ + morekeywords=[3]{ % Primitivas bool,char,f32,f64,i8,i16,i32,i64,isize,str,u8,u16,u32,u64,unit,usize,i128,u128 }, - morekeywords=[4]{ + morekeywords=[4]{ % Valor y tipo de constructores Err,false,None,Ok,Some,true }, - morekeywords=[5]{ + morekeywords=[5]{ % Identificadores assert!,assert_eq!,assert_ne!,cfg!,column!,compile_error!,concat!,concat_idents!,debug_assert!,debug_assert_eq!,debug_assert_ne!,env!,eprint!,eprintln!,file!,format!,format_args!,include!,include_bytes!,include_str!,line!,module_path!,option_env!,panic!,print!,println!,select!,stringify!,thread_local!,try!,unimplemented!,unreachable!,vec!,write!,writeln! }, - morekeywords={ + morekeywords={ % Palabras reservadas abstract,alignof,become,box,do,final,macro,offsetof,override,priv, proc,pure,sizeof,typeof,unsized,virtual,yield }, morekeywords={ @@ -3851,14 +3767,12 @@ \lstdefinestyle{rust}{ language=Rust, keywordstyle=[2]\color[rgb]{0.75,0,0}, % Traits - keywordstyle=[3]\color[rgb]{0,0.5,0}, % Primitive types - keywordstyle=[4]\color[rgb]{0,0.5,0}, % Type and value constructors + keywordstyle=[3]\color[rgb]{0,0.5,0}, % Primitivas + keywordstyle=[4]\color[rgb]{0,0.5,0}, % Valor y tipo de constructores keywordstyle=[5]\color[rgb]{0,0,0.75} % Macros } -% ----------------------------------------------------------------------------- % Scala -% ----------------------------------------------------------------------------- \lstdefinestyle{scala}{ language=scala, breakatwhitespace=true, @@ -3875,9 +3789,7 @@ } } -% ----------------------------------------------------------------------------- % Scheme -% ----------------------------------------------------------------------------- \lstdefinestyle{scheme}{ language=Lisp, morecomment=[l]{;}, @@ -3887,24 +3799,18 @@ morestring=[b]" } -% ----------------------------------------------------------------------------- % SQL -% ----------------------------------------------------------------------------- \lstdefinestyle{sql}{ language=SQL, breakatwhitespace=true } -% ----------------------------------------------------------------------------- % Swift -% ----------------------------------------------------------------------------- \lstdefinestyle{swift}{ language=Swift } -% ----------------------------------------------------------------------------- % TCL -% ----------------------------------------------------------------------------- \lstdefinestyle{tcl}{ language=tcl, breakatwhitespace=false, @@ -3912,24 +3818,18 @@ morecomment=[l]{\#} } -% ----------------------------------------------------------------------------- % Visual Basic -% ----------------------------------------------------------------------------- \lstdefinestyle{vbscript}{ language=[Visual]Basic, extendedchars=true } -% ----------------------------------------------------------------------------- % Verilog -% ----------------------------------------------------------------------------- \lstdefinestyle{verilog}{ language=Verilog } -% ----------------------------------------------------------------------------- % VDHL -% ----------------------------------------------------------------------------- \lstdefinelanguage{VHDL}{ morekeywords=[1]{ ALL,all,and,architecture,begin,downto,end,entity,in,is,library,Not,of,or,out,port,use @@ -3943,9 +3843,7 @@ language=VHDL } -% ----------------------------------------------------------------------------- % XML -% ----------------------------------------------------------------------------- \lstdefinelanguage{XML}{ morecomment=[s]{}, morekeywords={ @@ -4183,10 +4081,10 @@ \AddEnumerateCounter{\greek}{\@greek}{24} \AddEnumerateCounter{\Greek}{\@Greek}{12} +% ----------------------------------------------------------------------------- % CONFIGURACIÓN INICIAL DEL DOCUMENTO % ----------------------------------------------------------------------------- % Se revisa si las variables no han sido borradas -% ----------------------------------------------------------------------------- \checkvardefined{\autordeldocumento} \checkvardefined{\codigodelcurso} \checkvardefined{\departamentouniversidad} @@ -4288,15 +4186,15 @@ Template.Autor.Nombre={Pablo Pizarro R.}, Template.Autor.Web={https://ppizarror.com}, Template.Codificacion={UTF-8}, - Template.Fecha={24/06/2021}, + Template.Fecha={09/07/2021}, Template.Latex.Compilador={pdflatex}, Template.Licencia.Tipo={MIT}, Template.Licencia.Web={https://opensource.org/licenses/MIT}, Template.Nombre={Template-Controles}, Template.Tipo={Normal}, - Template.Version.Dev={4.2.6-CTR/EXM}, - Template.Version.Hash={923F57D088312F7855098404B8069A10}, - Template.Version.Release={4.2.6}, + Template.Version.Dev={4.2.7-CTR/EXM}, + Template.Version.Hash={9B47C2E159A7F733D9C632889F5D2241}, + Template.Version.Release={4.2.7}, Template.Web.Dev={https://github.com/Template-Latex/Template-Controles}, Template.Web.Manual={https://latex.ppizarror.com/controles}, Universidad.Departamento={\pdfmetainfounidepto}, @@ -4308,7 +4206,7 @@ pdfmenubar={\cfgpdfmenubar}, pdfpagelayout={\cfgpdflayout}, pdfpagemode={\cfgpdfpagemode}, - pdfproducer={Template-Controles v4.2.6 | (Pablo Pizarro R.) ppizarror.com}, + pdfproducer={Template-Controles v4.2.7 | (Pablo Pizarro R.) ppizarror.com}, pdfremotestartview={Fit}, pdfstartpage={1}, pdfstartview={\cfgpdfpageview}, @@ -4843,10 +4741,31 @@ % ----------------------------------------------------------------------------- % Formato de columnas % ----------------------------------------------------------------------------- +% Centrado \newcolumntype{C}[1]{>{\centering\let\newline\\\arraybackslash\hspace{0pt}}m{#1}} +\newcolumntype{\CColor}[2]{>{\columncolor{#1}\centering\let\newline\\\arraybackslash\hspace{0pt}}m{#2}} + +\newcolumntype{P}[1]{>{\centering\let\newline\\\arraybackslash\hspace{0pt}}p{#1}} +\newcolumntype{\PColor}[2]{>{\columncolor{#1}\centering\let\newline\\\arraybackslash\hspace{0pt}}p{#2}} + +\newcolumntype{B}[1]{>{\centering\let\newline\\\arraybackslash\hspace{0pt}}b{#1}} +\newcolumntype{\BColor}[2]{>{\columncolor{#1}\centering\let\newline\\\arraybackslash\hspace{0pt}}b{#2}} + +% Izquierda \newcolumntype{L}[1]{>{\raggedright\let\newline\\\arraybackslash\hspace{0pt}}m{#1}} -\newcolumntype{P}[1]{>{\centering\arraybackslash}p{#1}} +\newcolumntype{\LColor}[2]{>{\columncolor{#1}\raggedright\let\newline\\\arraybackslash\hspace{0pt}}m{#2}} +\newcolumntype{T}[1]{>{\raggedright\let\newline\\\arraybackslash\hspace{0pt}}p{#1}} +\newcolumntype{\TColor}[2]{>{\columncolor{#1}\raggedright\let\newline\\\arraybackslash\hspace{0pt}}p{#2}} +\newcolumntype{F}[1]{>{\raggedright\let\newline\\\arraybackslash\hspace{0pt}}b{#1}} +\newcolumntype{\FColor}[2]{>{\columncolor{#1}\raggedright\let\newline\\\arraybackslash\hspace{0pt}}b{#2}} + +% Derecha \newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}m{#1}} +\newcolumntype{\RColor}[2]{>{\columncolor{#1}\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}m{#2}} +\newcolumntype{H}[1]{>{\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}p{#1}} +\newcolumntype{\HColor}[2]{>{\columncolor{#1}\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}p{#2}} +\newcolumntype{G}[1]{>{\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}b{#1}} +\newcolumntype{\GColor}[2]{>{\columncolor{#1}\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}b{#2}} % ----------------------------------------------------------------------------- % Parcha el entorno multicols @@ -4863,7 +4782,9 @@ \setcaptionmargincm{\captionlrmargin}% } +% ----------------------------------------------------------------------------- % CONFIGURACIÓN DE PÁGINA Y ENCABEZADOS +% ----------------------------------------------------------------------------- \newcommand{\templatePagecfg}{ % ------------------------------------------------------------------------- diff --git a/template_config.tex b/template_config.tex index be15a25..54b1ebd 100644 --- a/template_config.tex +++ b/template_config.tex @@ -1,6 +1,6 @@ % Template: Template Controles LaTeX % Documento: Configuraciones del template -% Versión: 4.2.6 (24/06/2021) +% Versión: 4.2.7 (09/07/2021) % Codificación: UTF-8 % % Autor: Pablo Pizarro R. @@ -128,8 +128,8 @@ \def\sourcecodenumbersep {6} % Separación entre número línea y código [pt] \def\sourcecodetabsize {3} % Tamaño tabulación código fuente \def\tabledefaultplacement {H} % Posición por defecto de las tablas -\def\tablepaddingh {0.85} % Espaciado horizontal de celda de las tablas -\def\tablepaddingv {1.05} % Espaciado vertical de celda de las tablas +\def\tablepaddingh {0.75} % Espaciado horizontal de celda de las tablas +\def\tablepaddingv {1.15} % Espaciado vertical de celda de las tablas \def\tikzdefaultplacement {H} % Posición por defecto de las figuras tikz % CONFIGURACIÓN DE LOS TÍTULOS