texlive[74650] Master/texmf-dist: upmethodology (16mar25)
commits+karl at tug.org
commits+karl at tug.org
Sun Mar 16 20:57:13 CET 2025
Revision: 74650
https://tug.org/svn/texlive?view=revision&revision=74650
Author: karl
Date: 2025-03-16 20:57:13 +0100 (Sun, 16 Mar 2025)
Log Message:
-----------
upmethodology (16mar25)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
trunk/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-backpage.sty
trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-code.sty
trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls
trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty
trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-frontpage.sty
trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty
trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-spec.sty
trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-task.sty
trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/upmethodology/upm_caution.pdf
trunk/Master/texmf-dist/doc/latex/upmethodology/upm_caution.png
trunk/Master/texmf-dist/doc/latex/upmethodology/upm_caution.svg
trunk/Master/texmf-dist/doc/latex/upmethodology/upm_info.pdf
trunk/Master/texmf-dist/doc/latex/upmethodology/upm_info.png
trunk/Master/texmf-dist/doc/latex/upmethodology/upm_info.svg
trunk/Master/texmf-dist/doc/latex/upmethodology/upm_question.pdf
trunk/Master/texmf-dist/doc/latex/upmethodology/upm_question.png
trunk/Master/texmf-dist/doc/latex/upmethodology/upm_question.svg
Deleted: trunk/Master/texmf-dist/doc/latex/upmethodology/upm_caution.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/upmethodology/upm_caution.png
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/upmethodology/upm_caution.svg
===================================================================
--- trunk/Master/texmf-dist/doc/latex/upmethodology/upm_caution.svg 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/doc/latex/upmethodology/upm_caution.svg 2025-03-16 19:57:13 UTC (rev 74650)
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="459.36514mm"
- height="403.86578mm"
- viewBox="0 0 459.36514 403.86578"
- version="1.1"
- id="svg8"
- inkscape:version="0.92.3 (2405546, 2018-03-11)"
- sodipodi:docname="upm_caution.svg">
- <defs
- id="defs2" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.35"
- inkscape:cx="752.37725"
- inkscape:cy="438.39011"
- inkscape:document-units="mm"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="1"
- fit-margin-left="1"
- fit-margin-right="1"
- fit-margin-bottom="1"
- inkscape:window-width="1920"
- inkscape:window-height="1016"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata5">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(266.72422,139.04175)">
- <path
- style="fill:#000000;stroke-width:0.62582618"
- d="m -212.60337,263.42429 c -20.40713,-2.18391 -38.15074,-14.72666 -47.23856,-33.39241 -4.4232,-9.08493 -5.88229,-15.5486 -5.88229,-26.05812 0,-9.97926 1.38896,-16.61129 5.16106,-24.64315 2.13063,-4.53669 170.094856,-285.58754 174.872396,-292.61014 2.80467,-4.12262 10.14804,-11.27841 14.78013,-14.40257 5.70158,-3.84549 13.43076,-7.30997 19.86487,-8.90409 7.84855,-1.94456 20.16195,-1.94025 28.0852,0.01 14.0265597,3.45225 27.3429997,12.69057 35.32656,24.50787 5.20966,7.71139 171.908824,286.69932 174.114994,291.39909 3.77147,8.03431 5.15993,14.66542 5.15993,24.64315 0,10.49408 -1.46147,16.98488 -5.84784,25.97179 -8.02871,16.44946 -21.03035,27.05403 -39.39326,32.13045 l -6.01974,1.66416 -174.292604,0.0774 c -95.860926,0.0426 -176.271806,-0.13441 -178.690846,-0.39328 z m 353.41703,-41.18362 c 4.09926,-2.01916 7.84833,-5.86726 9.77569,-10.03393 2.26834,-4.90381 2.30606,-11.50764 0.0924,-16.17113 -0.84707,-1.78445 -39.69986,-66.93911 -86.339554,-144.788154 -54.32854,-90.682917 -85.69897,-142.454558 -87.30276,-144.078583 -7.62051,-7.716653 -20.54911,-7.715273 -28.16218,0.0031 -1.60072,1.622843 -33.07831,53.57449 -87.302746,144.087313 -46.6397,77.852064 -85.49249,143.005384 -86.33954,144.785024 -1.22003,2.56328 -1.53635,4.21116 -1.52209,7.92942 0.0266,6.93942 2.9323,12.73748 8.19953,16.36143 5.60714,3.85782 -8.39743,3.59061 181.671766,3.46619 l 174.292594,-0.1141 z M -41.997334,182.98534 c -4.38549,-1.22063 -6.93988,-2.8342 -10.01226,-6.32461 -4.46309,-5.07034 -5.814,-12.64867 -3.49706,-19.61775 1.57453,-4.73601 6.82348,-9.99491 11.5871,-11.60905 7.68828,-2.60516 15.09255,-0.93488 20.69614,4.66871 7.87961,7.87961 7.87961,19.75688 0,27.63648 -5.18434,5.18435 -12.07655,7.11032 -18.77392,5.24622 z m 0,-80.10576 c -4.38549,-1.22062 -6.93988,-2.83419 -10.01226,-6.324604 -4.90404,-5.57129 -4.74558,-3.80848 -4.74558,-52.79273 0,-50.4000303 -0.29789,-47.6779503 5.89528,-53.87111 7.92613,-7.92613 19.71036,-7.92613 27.63648,0 6.19317,6.1931597 5.89529,3.4710797 5.89529,53.87111 0,50.40003 0.29788,47.67795 -5.89529,!
53.87112 -5.18434,5.184354 -12.07655,7.110324 -18.77392,5.246214 z"
- id="path826"
- inkscape:connector-curvature="0" />
- </g>
-</svg>
Deleted: trunk/Master/texmf-dist/doc/latex/upmethodology/upm_info.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/upmethodology/upm_info.png
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/upmethodology/upm_info.svg
===================================================================
--- trunk/Master/texmf-dist/doc/latex/upmethodology/upm_info.svg 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/doc/latex/upmethodology/upm_info.svg 2025-03-16 19:57:13 UTC (rev 74650)
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="483.41724mm"
- height="483.58493mm"
- viewBox="0 0 483.41724 483.58493"
- version="1.1"
- id="svg8"
- inkscape:version="0.92.3 (2405546, 2018-03-11)"
- sodipodi:docname="upm_info.svg">
- <defs
- id="defs2" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.35"
- inkscape:cx="786.40841"
- inkscape:cy="738.47373"
- inkscape:document-units="mm"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="1"
- fit-margin-left="1"
- fit-margin-right="1"
- fit-margin-bottom="1"
- inkscape:window-width="1920"
- inkscape:window-height="1016"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata5">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(275.7283,139.36375)">
- <path
- style="fill:#000000;stroke-width:0.94228286"
- d="M -50.629174,342.63035 C -148.23295,335.6258 -231.66491,270.94797 -262.44275,178.42896 c -13.72051,-41.24422 -16.01412,-86.353786 -6.55164,-128.854516 14.61802,-65.65686 56.78878,-122.656827 115.77775,-156.490604 51.23814,-29.38821 113.509446,-38.7035 171.966626,-25.72484 65.35134,14.50931 122.724244,56.898004 156.323384,115.496065 29.53965,51.518189 38.88881,113.716409 25.89205,172.255055 C 187.74026,214.67757 150.67357,268.6707 99.786306,302.4925 55.206316,332.12222 1.7426262,346.38883 -50.629174,342.63035 Z M 1.7888862,310.71155 C 90.655376,294.58538 158.39702,226.83612 174.33204,138.14903 176.82229,124.28935 177.75515,95.574844 176.19823,80.705324 165.8096,-18.51181 88.446736,-96.298711 -11.307384,-107.82805 c -14.32949,-1.65617 -44.71464,-0.70735 -58.72313,1.83371 -88.725516,16.094288 -156.229676,83.59845 -172.323966,172.323964 -2.54106,14.00849 -3.48988,44.393636 -1.83371,58.723136 5.62974,48.70962 26.59842,92.35266 60.8347,126.61795 33.57995,33.6084 77.34927,54.90662 124.836276,60.74555 12.49887,1.53685 47.96805,0.53421 60.3061002,-1.70471 z M -72.180314,222.05146 c -5.84584,-1.09145 -8.3517,-2.4051 -11.561623,-6.06101 -5.72662,-6.52227 -6.122841,-14.84656 -1.564029,-32.85907 2.988384,-11.80753 6.517502,-21.47779 23.878282,-65.42978 7.81983,-19.797306 14.21787,-37.076416 14.21787,-38.398026 0,-2.89548 -3.35806,-6.53144 -5.33249,-5.77378 -0.77969,0.2992 -1.94629,0.544 -2.59243,0.544 -2.98701,0 -11.02384,6.93723 -20.09923,17.34926 -10.479228,12.022606 -13.223316,14.391016 -15.611805,13.474466 -5.25969,-2.01833 -3.06198,-7.989866 7.276694,-19.771926 18.025341,-20.54187 36.562011,-31.87892 56.704351,-34.68047 8.94164,-1.24366 14.34434,-0.5838 20.8810302,2.55033 8.9149,4.2744 12.44687,14.77514 9.69678,28.82902 -0.99107,5.06472 -12.83123,38.496196 -31.0451802,87.658136 -5.07705,13.70363 -5.89677,19.26179 -3.23353,21.92503 3.93427,3.93427 11.28544,-1.04288 26.5802802,-17.99635 10.23477,-11.34466 12.58354,-12.99952 15.0086098,-10.57445 3.52307,3.52307 -1.3112798,12.59349 -13.3445798,25.03766 -2!
2.9692802,23.75357 -51.3418102,37.63419 -69.8590002,34.17696 z m 56.16454,-189.094266 c -14.58873,-7.26987 -16.60484,-29.0672942 -3.86671,-41.8054222 13.9393902,-13.9393878 37.00993,-11.0148908 44.06881,5.586296 2.21956,5.22003 1.88071,15.5571272 -0.70558,21.5244162 -2.69677,6.222195 -10.50783,13.5736 -16.6437098,15.66431 -7.10534001,2.42104 -16.8810102,2.00627 -22.8528102,-0.9696 z"
- id="path826"
- inkscape:connector-curvature="0" />
- </g>
-</svg>
Deleted: trunk/Master/texmf-dist/doc/latex/upmethodology/upm_question.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/upmethodology/upm_question.png
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/upmethodology/upm_question.svg
===================================================================
--- trunk/Master/texmf-dist/doc/latex/upmethodology/upm_question.svg 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/doc/latex/upmethodology/upm_question.svg 2025-03-16 19:57:13 UTC (rev 74650)
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="272.62253mm"
- height="272.69568mm"
- viewBox="0 0 272.62253 272.69568"
- version="1.1"
- id="svg8"
- inkscape:version="0.92.3 (2405546, 2018-03-11)"
- sodipodi:docname="upm_question.svg">
- <defs
- id="defs2" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.7"
- inkscape:cx="284.24507"
- inkscape:cy="557.15914"
- inkscape:document-units="mm"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="1"
- fit-margin-left="1"
- fit-margin-right="1"
- fit-margin-bottom="1"
- inkscape:window-width="1920"
- inkscape:window-height="1016"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata5">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(82.263126,11.644881)">
- <path
- style="fill:#000000;stroke-width:0.26458332"
- d="m 47.696668,259.83414 c -53.2068575,-2.50997 -99.768707,-35.83013 -119.592857,-85.58191 -10.87333,-27.2883 -12.3394,-58.55107 -4.08835,-87.180208 6.35254,-22.041762 17.96837,-41.669022 34.37821,-58.088835 21.37988,-21.3928775 48.4781595,-34.7253809 78.45901,-38.6022619 10.57707,-1.3677421 23.818756,-1.3677421 34.395829,0 29.89096,3.865258 57.06573,17.2143174 78.32385,38.4750189 14.21716,14.218887 24.74675,30.620937 31.59834,49.221067 9.68204,26.283999 10.82247,56.070249 3.18588,83.210629 -13.78275,48.98375 -54.38371,86.46101 -104.157021,96.14355 -7.278023,1.41581 -12.464017,2.02753 -20.460424,2.41345 -5.734372,0.27673 -5.95754,0.27654 -12.042467,-0.0106 z m 13.100801,-17.1949 c 36.472887,-2.16696 69.087171,-20.41893 90.287381,-50.52764 4.57375,-6.49567 9.66356,-15.92252 12.71417,-23.54791 12.50792,-31.26516 11.05543,-66.66762 -3.9666,-96.68055 -4.15086,-8.293118 -9.3939,-16.257772 -15.51756,-23.572575 C 141.45109,44.889743 133.27988,36.789707 129.72142,33.844244 102.4261,11.25089 67.362146,2.0589791 32.619341,8.3892255 12.849791,11.991298 -5.6954795,20.677504 -21.487939,33.731923 c -3.65673,3.022738 -11.80419,11.088814 -14.72573,14.578642 -27.3699,32.69377 -35.23711,76.390085 -20.9576,116.403355 9.19158,25.75615 27.93914,48.19964 51.9551995,62.19775 19.8162305,11.55018 43.0712805,17.09064 66.0135385,15.72757 z M 41.350595,190.5241 v -14.81667 h 14.816666 14.816665 v 14.81667 14.81667 H 56.167261 41.350595 Z m 0.0083,-34.99114 c 0.01468,-11.40727 1.317902,-18.13398 4.816347,-24.85992 3.258116,-6.2639 9.041895,-12.42289 21.236857,-22.61458 8.492331,-7.09729 13.036478,-11.248854 14.510549,-13.256938 2.629585,-3.58222 3.877989,-7.514201 3.877989,-12.214151 0,-5.697254 -1.732084,-10.008327 -5.744389,-14.297511 -5.60139,-5.987925 -13.707874,-8.848492 -23.756651,-8.383103 -8.213103,0.380376 -14.533218,2.898172 -19.833516,7.901239 -4.52386,4.270176 -7.34469,9.27224 -9.55034,16.935277 -0.51121,1.776079 -0.96859,3.26835 -1.0164,3.316158 -0.0478,0.04781 -0.90684,-0.03297 -1.90896,-0.179502 -1.00212,-0.14!
6536 -7.29891,-0.927512 -13.9928605,-1.735505 -6.69396,-0.807992 -12.45352,-1.53112 -12.79903,-1.606949 -0.6121,-0.13434 -0.62347,-0.186661 -0.44402,-2.042808 0.84075,-8.696415 4.09672005,-17.077285 9.43042,-24.273885 1.94824,-2.628707 6.4672905,-7.345351 9.1285605,-9.527704 6.16061,-5.052002 13.69744,-8.821935 21.88403,-10.946455 14.294481,-3.709588 33.357741,-2.837921 46.720577,2.136301 5.68738,2.117085 12.154873,5.926008 16.438422,9.681142 9.33319,8.181831 14.59731,17.045373 16.30313,27.450643 0.60341,3.680675 0.54209,10.001533 -0.13014,13.413864 -2.33014,11.828257 -8.65027,20.065057 -28.43589,37.059477 -7.810084,6.7083 -9.259411,8.05632 -11.85419,11.02559 -4.216066,4.82455 -5.380249,8.59564 -5.703308,18.47452 L 70.37385,161.9491 H 55.862222 41.350595 Z"
- id="path826"
- inkscape:connector-curvature="0" />
- </g>
-</svg>
Modified: trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex 2025-03-16 19:57:13 UTC (rev 74650)
@@ -2,7 +2,7 @@
\setfrontcover{classic}
-\declaredocument{\LaTeX\ Packages for Unified Process Methodology}{Official Documentation}{UPM-2019-01}
+\declaredocument{\LaTeX\ Packages for Structured Documents as for Unified Process Methodology}{Official Documentation}{UPM-2025-01}
\updateversion{23.0}{\makedate{17}{02}{2017}}{Replace the package \texttt{subfigure} by \texttt{subcaption}.}{\upmpublic}
\incsubversion{\makedate{10}{03}{2017}}{Fixing subfigure invalid alignement.}{\upmpublic}
@@ -12,7 +12,12 @@
\incversion{\makedate{17}{09}{2019}}{Add class options to include optional packages.}{\upmpublic}
\incversion{\makedate{06}{04}{2020}}{Add explainations for \texttt{{\textbackslash}Append} and \texttt{{\textbackslash}setdocumentpurpose}.}{\upmpublic}
\incversion{\makedate{03}{06}{2021}}{Add emphazing box with titles.}{\upmpublic}
-%\incversion{\makedate{17}{09}{2019}}{Add the documentation for the \texttt{upmethodology-spec} package.}{\upmpublic}
+\incversion{\makedate{14}{03}{2025}}{Update the documentation for the \texttt{declareupmtheorem} macro and \texttt{definition} environment.}{\upmpublic}
+\incsubversion{\makedate{15}{03}{2025}}{Add the mention of the dependency to \texttt{tobibind} in the dependencies of \texttt{upmmethodology-fmt}.}{\upmpublic}
+\incversion{\makedate{15}{03}{2025}}{Add the macros \texttt{{\textbackslash}defref} and \texttt{{\textbackslash}defpageref}.}{\upmpublic}
+\incversion{\makedate{15}{03}{2025}}{Add the optional "source text" to the macros \texttt{{\textbackslash}mfigure} and \texttt{{\textbackslash}mfigure*}.}{\upmpublic}
+\incversion{\makedate{15}{03}{2025}}{Add the macros \texttt{{\textbackslash}addsource} and \texttt{{\textbackslash}tablenote} for the \texttt{mtable} environment.}{\upmpublic}
+\incversion{\makedate{15}{03}{2025}}{Use the package \texttt{tcolorbox} for implementing \texttt{mtabular} and \texttt{mtable} environments.}{\upmpublic}
\addauthorvalidator*[galland at arakhne.org]{St{\'e}phane}{Galland}{Original Author}
\addauthor*{Frans}{van Dunn\'e}{Reviewer}
@@ -43,16 +48,16 @@
%\tracingmacros=2
%\tracingcommands=1
-\declareupmtheorem{mytheorem}{My Theorem}{List of my Theorems}
+\declareupmtheorem{mytheorem}{My Theorem}{List of my Theorems}{thm}{mytheorem}{\textbf}
\begin{document}
\tableofcontents
+\listoftables
+
\listoffigures
-\listoftables
-
%###########################################################
\chapter{Introduction}
@@ -157,6 +162,7 @@
\texttt{upmethodology-document} package depends on:
\begin{itemize}
\item \texttt{babel}
+\item \texttt{draftwatermark} (only if the document is marked as "draft" or "restricted")
\item \texttt{upmethodology-extension}
\item \texttt{upmethodology-fmt}
\item \texttt{upmethodology-p-common}
@@ -175,22 +181,30 @@
\texttt{upmethodology-fmt} package depends on:
\begin{itemize}
+\item \texttt{bbm}
\item \texttt{amsmath}
\item \texttt{amsthm}
\item \texttt{colortbl}
\item \texttt{environ}
+\item \texttt{fontawesome5}
\item \texttt{graphicx}
\item \texttt{hyphenat}
-\item \texttt{mathbb}
\item \texttt{multicol}
\item \texttt{picinpar}
\item \texttt{pifont}
+\item \texttt{relsize}
\item \texttt{setspace}
\item \texttt{subcaption}
\item \texttt{tabularx}
+\item \texttt{tcolorbox}
\item \texttt{thmtools}
+\item \texttt{tikz}
+\item \texttt{titlesec}
+\item \texttt{tocbibind}
\item \texttt{txfonts}
\item \texttt{upmethodology-p-common}
+\item \texttt{varioref}
+\item \texttt{xcolor}
\item \texttt{xkeyval}
\end{itemize}
@@ -207,6 +221,7 @@
\texttt{upmethodology-p-common} package depends on:
\begin{itemize}
+\item \texttt{ifpdf}
\item \texttt{ifthen}
\item \texttt{xcolor}
\item \texttt{xspace}
@@ -267,7 +282,6 @@
Table~\tabref{documentclassoptions} contains the options supported by \texttt{upmethodology-document}. Any option not explicitely supported by the class is directly passed to the underlying standard \LaTeX\ class (\texttt{book}, \texttt{report} or \texttt{article} according to the type of document, see~\ref{section:documentclass:doctype}).
\begin{mtable}{\linewidth}{2}{|l|X|}{Options of \texttt{upmethodology-document} class}{documentclassoptions}
-\captionastitle
\tabularheader{Option}{Explanation}
book & see section~\ref{section:documentclass:doctype}. \\
@@ -449,13 +463,15 @@
In order to define a search path that is valid for a part of the document, the \texttt{graphicspathcontext} environment is defined. This environment redefines the \texttt{graphicx} path with the environment's parameter. The original value of the \texttt{graphicx} path is restored when existing of the environment.
-The defined environment is: \\
+\paragraph{Syntax} \mbox{}\\
\texttt{{\textbackslash}begin\{graphicspathcontext\}\{path\}} \\
\texttt{...}\\
\texttt{{\textbackslash}end\{graphicspathcontext\}} \\
-The parameter \texttt{path} must follow the syntactic definition of the \texttt{graphicx} path. If you want to reuse the current value of the \texttt{graphicx} path, you could obtain it by using the \texttt{{\textbackslash}old} macro, such as: \\
+The parameter \texttt{path} must follow the syntactic definition of the \texttt{graphicx} path. If you want to reuse the current value of the \texttt{graphicx} path, you could obtain it by using the \texttt{{\textbackslash}old} macro.
+
+\paragraph{Syntax with \texttt{{\textbackslash}old}} \mbox{}\\
\texttt{{\textbackslash}begin\{graphicspathcontext\}\{{mypath},{\textbackslash}old\}} \\
\texttt{...}\\
\texttt{{\textbackslash}end\{graphicspathcontext\}} \\
@@ -465,10 +481,18 @@
\section{Figures}
-It may be verbose to put \LaTeX\ code to include a figure inside your document. To simplify your life, you could include a figure with the following macros: \\
-\texttt{{\textbackslash}mfigure[position]\{include\_graphics\_options\}\{filename\}\{caption\}\{label\}} \\
-\texttt{{\textbackslash}mfigure*[position]\{include\_graphics\_options\}\{filename\}\{caption\}\{label\}} \\
+It may be verbose to put \LaTeX\ code to include a figure inside your document. To simplify your life, you could include a figure with the following macros.
+\paragraph{Syntax 1} \mbox{}\\
+\texttt{{\textbackslash}mfigure[position]\{include\_graphics\_options\}\{filename\}\{caption\}\{label\}[source text]}
+
+\paragraph{Syntax 2} \mbox{}\\
+\texttt{{\textbackslash}mfigure*[position]\{include\_graphics\_options\}\{filename\}\{caption\}\{label\}[source text]}
+
+The difference between \texttt{{\textbackslash}mfigure} and \texttt{{\textbackslash}mfigure*} is the same as the difference between \texttt{{\textbackslash}begin\{figure\}} and \texttt{{\textbackslash}begin\{figure*\}}: the star-version fits to the entire paper width event if the document has two or more columns.
+
+\subsection{Macros for Including Figures}
+
These two macros make it possible to include an image in your document. The parameters are:
\begin{itemize}
\item \texttt{position}: is the desired position of the figure (see {\textbackslash}begin\{figure\}[position]). It could be \texttt{t} (top of the page), \texttt{b} (bottom of the page), \texttt{h} (at the macro location if possible) or \texttt{H} (at macro location);
@@ -480,9 +504,11 @@
\item \texttt{caption}: is the caption of the figure (see {\textbackslash}caption\{caption\});
\item \texttt{label}: is the label used to reference the figure (see {\textbackslash}label\{fig:label\}).
+
+\item \texttt{source text}: is the optinal text used to describe the source of the figure. If this value is provided, it is rendered below the caption itself.
\end{itemize}
-The difference between \texttt{{\textbackslash}mfigure} and \texttt{{\textbackslash}mfigure*} is the same as the difference between \texttt{{\textbackslash}begin\{figure\}} and \texttt{{\textbackslash}begin\{figure*\}}: the star-version fits to the entire paper width event if the document has two or more columns.
+\subsection{Macros for Referencing Figures}
Because the two macros above register a label with string starting with \texttt{fig:}, we propose the following function to easily access to the figure's references:
\begin{itemize}
@@ -490,19 +516,47 @@
\item \texttt{{\textbackslash}figpageref\{label\}}: is equivalent to \texttt{{\textbackslash}pageref\{fig:label\}}.
\end{itemize}
-The figure~\figref{example:mfigure} page~\figpageref{example:mfigure} is obtained with the macro: \texttt{{\textbackslash}mfigure[ht]\{width=.4{\textbackslash}linewidth\}\{slogo\}\{Example of figure inclusion with {\textbackslash}texttt\{\{{\textbackslash}textbackslash\}mfigure\}\}\{example:mfigure\}}. The reference and page reference are obtained with \texttt{{\textbackslash}figref\{example:mfigure\}} and \texttt{{\textbackslash}figpageref\{example:mfigure\}}.
+\subsection{Example without Source Text}
-\mfigure[ht]{width=.4\linewidth}{arakhne_org_logo}{Example of figure inclusion with \texttt{{\textbackslash}mfigure}}{example:mfigure}
+The figure~\figref{example:mfigure1} page~\figpageref{example:mfigure1} is obtained with the macro:
+\texttt{{\textbackslash}mfigure[ht]\{width=.4{\textbackslash}linewidth\}\{slogo\}\{Example of figure inclusion with {\textbackslash}texttt\{\{{\textbackslash}textbackslash\}mfigure\}\}\{example:mfigure1\}}
+
+The reference and page reference are obtained with \texttt{{\textbackslash}figref\{example:mfigure1\}} and \texttt{{\textbackslash}figpageref\{example:mfigure1\}}.
+
+\mfigure[ht]{width=.4\linewidth}{arakhne_org_logo}{Example of figure inclusion with \texttt{{\textbackslash}mfigure}}{example:mfigure1}
+
+\subsection{Example with Source Text}
+
+For illustrating the rendering of the source text argument, the figure~\figref{example:mfigure2} page~\figpageref{example:mfigure2} is obtained with the macro:
+
+\texttt{{\textbackslash}mfigure[ht]\{width=.4{\textbackslash}linewidth\}\{slogo\}\{Example of figure inclusion with {\textbackslash}texttt\{\{{\textbackslash}textbackslash\}mfigure with source text\}\}\{example:mfigure2\}[This text explain the source]}
+
+\mfigure[ht]{width=.4\linewidth}{arakhne_org_logo}{Example of figure inclusion with \texttt{{\textbackslash}mfigure with source text}}{example:mfigure2}[This text explain the source]
+
+\subsection{Rendering of the source text}
+
+The source text that could be provided to the macros \texttt{{\textbackslash}mfigure} or \texttt{{\textbackslash}mfigure*} is rendered with a specific configuration.
+
+First the color of the source text is defined by \texttt{figuresourceforeground}. The default color is \textcolor{figuresourceforeground}{gray}.
+
+The prefix text that is written before the provided source text is defined by the macro \texttt{{\textbackslash}figuresourcename}.
+
+It is also possible to change the color and the font of the source text by redefining the macro \texttt{{\textbackslash}mfigureformatsource[1]}. This macro takes one argument that is the source text provided to \texttt{{\textbackslash}mfigure} or \texttt{{\textbackslash}mfigure*}.
+
\section{Sub-figures}
-In some case, it is useful to put several images inside the same floating figure, but without loosing the possibility to reference each of the subfigures. This feature was proposed by the package \texttt{subcaption}. The following environments provides helper functions for \texttt{subcaption}:
+In some case, it is useful to put several images inside the same floating figure, but without loosing the possibility to reference each of the subfigures. This feature was proposed by the package \texttt{subcaption}. The following environments provides helper functions for \texttt{subcaption}.
+
+\paragraph{Syntax 1} \mbox{}\\
\texttt{{\textbackslash}begin\{mfigures\}[position]\{caption\}\{label\}\\
...\\
-{\textbackslash}end\{mfigures\}} \\
+{\textbackslash}end\{mfigures\}}
+
+\paragraph{Syntax 2} \mbox{}\\
\texttt{{\textbackslash}begin\{mfigures*\}[position]\{caption\}\{label\}\\
...\\
-{\textbackslash}end\{mfigures*\}} \\
+{\textbackslash}end\{mfigures*\}}
These two macros enable you to include an image in your document. The parameters are:
\begin{itemize}
@@ -550,30 +604,40 @@
\item a PDF figure (\texttt{.pdf}), and a \TeX\ file \texttt{.pdftex\_t} related to the PDF figure.
\end{enumerate}
-With the \texttt{upmethodology-fmt} package, the inclusion of the figure with embedded \TeX\ macros is similar to the inclusion of figures with \texttt{{\textbackslash}includegraphics}. You must type the following macro: \\
-\texttt{{\textbackslash}includegraphicswtex[options]\{filename\}} \\
+With the \texttt{upmethodology-fmt} package, the inclusion of the figure with embedded \TeX\ macros is similar to the inclusion of figures with \texttt{{\textbackslash}includegraphics}. You must type the following macro.
+
+\paragraph{Syntax} \texttt{{\textbackslash}includegraphicswtex[options]\{filename\}}
+
where \texttt{options} must be one or more of: \begin{itemize}
\item \texttt{width=xxx}: specification of the width of the figure (\texttt{xxx} must be replaced by the length);
\item \texttt{height=xxx}: specification of the height of the figure (\texttt{xxx} must be replaced by the length);
\end{itemize}
-If the \texttt{filename} given to the macro \texttt{{\textbackslash}includegraphicswtex} does not specify a filename extension, the macro tries to add the extensions \texttt{.pdftex\_t}, \texttt{.pstex\_t}, \texttt{.pdf\_tex}, or \texttt{.ps\_tex}, by default. If you want to specify other file extensions, you must use the macro:
-\texttt{{\textbackslash}DeclareGraphicsExtensionsWtex\{extensions\}} \\
-where the \texttt{extensions} is a list of file extensions (including the point character), separated by coma characters. \\
-Example: \texttt{{\textbackslash}DeclareGraphicsExtensionsWtex\{.pdftex,.pstex\}}
+If the \texttt{filename} given to the macro \texttt{{\textbackslash}includegraphicswtex} does not specify a filename extension, the macro tries to add the extensions \texttt{.pdftex\_t}, \texttt{.pstex\_t}, \texttt{.pdf\_tex}, or \texttt{.ps\_tex}, by default. If you want to specify other file extensions, you must use the macro.
+\paragraph{Syntax} \texttt{{\textbackslash}DeclareGraphicsExtensionsWtex\{extensions\}} \\
+where the \texttt{extensions} is a list of file extensions (including the point character), separated by coma characters.
+
+\paragraph{Example} \texttt{{\textbackslash}DeclareGraphicsExtensionsWtex\{.pdftex,.pstex\}}
+
If the \texttt{filename} does not correspond to a file on the disk, the macro \texttt{{\textbackslash}includegraphicswtex} tries to find the file in the directories specified in \texttt{{\textbackslash}graphicspath} (declared in the package \texttt{graphicx} for example). \\
-Example: \texttt{{\textbackslash}graphicspath\{\{./imgs/\},\{./imgs/additional/\}\}} \\
-\emph{Note that each of the given directories must be finished by the separation character of your operating system: \texttt{/} on Unix, \texttt{\textbackslash} on Windows. You must always use the Unix standard because it is assumed by a lot of \TeX\ compilers, even on Windows platforms.}
+\paragraph{Example} \texttt{{\textbackslash}graphicspath\{\{./imgs/\},\{./imgs/additional/\}\}} \\
+
+\begin{upminfo}
+ Note that each of the given directories must be finished by the separation character of your operating system: \texttt{/} on Unix, \texttt{\textbackslash} on Windows. You must always use the Unix standard because it is assumed by a lot of \TeX\ compilers, even on Windows platforms.
+\end{upminfo}
+
Figure~\figref{figure_and_tex} gives an example of a floating figure combined with \TeX\ macros, which is using the macro \texttt{{\textbackslash}includegraphicswtex}.
\subsection{Floating figure with embedded \TeX\ macros}
-To put a floating figure with \TeX\xspace macro inside, you may use one of the macros:
-\texttt{{\textbackslash}mfigurewtex[position]\{include\_graphics\_options\}\{filename\}\{caption\}\{label\}} \\
-\texttt{{\textbackslash}mfigurewtex*[position]\{include\_graphics\_options\}\{filename\}\{caption\}\{label\}}
+To put a floating figure with \TeX\xspace macro inside, you may use one of the macros.
+\paragraph{Syntax 1} \texttt{{\textbackslash}mfigurewtex[position]\{include\_graphics\_options\}\{filename\}\{caption\}\{label\}}
+
+\paragraph{Syntax 2} \texttt{{\textbackslash}mfigurewtex*[position]\{include\_graphics\_options\}\{filename\}\{caption\}\{label\}}
+
The parameters are:
\begin{itemize}
\item \texttt{position}: is the desired position of the figure (see {\textbackslash}begin{figure}[position]). It could be \texttt{t} (top of the page), \texttt{b} (bottom of the page), \texttt{h} (at the macro location if possible) or \texttt{H} (at macro location);
@@ -617,9 +681,10 @@
\section{Tabulars}
-You could include a tabular inside your document with the following environment: \\
-\texttt{{\textbackslash}begin\{mtabular\}[width]\{ncolumns\}\{columns\}...{\textbackslash}end\{mtabular\}} \\
+You could include a tabular inside your document with the following environment.
+\paragraph{Syntax} \texttt{{\textbackslash}begin\{mtabular\}[width]\{ncolumns\}\{columns\}...{\textbackslash}end\{mtabular\}}
+
This tabular is an extension of the \texttt{tabularx} environment which provides dynamic columns with the specifier \texttt{X}. The parameters are:
\begin{itemize}
\item \texttt{width}: is the desired width of the tabular;
@@ -632,26 +697,22 @@
\begin{upmcaution}
- You must note put any text nor \TeX\ macro before the first use of \texttt{{\textbackslash}tabulartitle} or \texttt{{\textbackslash}tabularheader}. Otherwhise, you will obtain a \TeX\ error.
-\end{upmcaution}
+ The following macro is deprecated: \texttt{{\textbackslash}tabulartitle}. \end{upmcaution}
The \texttt{mtabular} environment provides:
\begin{itemize}
-\item \texttt{{\textbackslash}tabulartitle\{title\}} \\
- This macro allows you to define the title of the tabular. It uses the colors \texttt{backtableheader} and \texttt{fronttableheader} for the background and the foreground respectively. The title has a single line at the top, and a single line below;
-
\item \texttt{{\textbackslash}tabulartitleinside\{title\}} \\
- This macro allows you to define the title of the tabular. It uses the colors \texttt{backtableheader} and \texttt{fronttableheader} for the background and the foreground respectively. The title has two lines at the top, and a single line below;
+ This macro allows you to define the title of the tabular. It uses the colors \texttt{tableheaderbackground} and \texttt{tableheaderforeground} for the background and the foreground respectively. The title has two lines at the top, and a single line below;
\item \texttt{{\textbackslash}tabularheader\{$header_1$\}...\{$header_n$\}} \\
- This macro allows you to define the titles of the columns. It uses the colors \texttt{backtableheader} and \texttt{fronttableheader} for the background and the foreground respectively. Because the count of columns was given to the environment this function takes the same count of parameters as the count of columns. This macro adds a line after the header, \emph{BUT NOT BEFORE}.
+ This macro allows you to define the titles of the columns. It uses the colors \texttt{tableheaderbackground} and \texttt{tableheaderforeground} for the background and the foreground respectively. Because the count of columns was given to the environment this function takes the same count of parameters as the count of columns. This macro adds a line after the header, \emph{BUT NOT BEFORE}.
\begin{upmcaution}
Because \texttt{{\textbackslash}tabularheader} is adding a \texttt{{\textbackslash}hline} at the end of its expansion. You must put a \texttt{{\textbackslash}tabularheader} just after \texttt{{\textbackslash}tabularheader}. Otherwise you may obtain a \TeX\ error.
\end{upmcaution}
\item \texttt{{\textbackslash}tabularrowheader\{title\}} \\
- This macro is designed to be used in the first cell of a row. It is rendering the cell as a row's header.
+ This macro is designed to be used in the first cell of a row. It is rendering the cell as a row's header. A row header is a cell that is an header for the row. Only the row header cell has the header background color.
\item \texttt{{\textbackslash}tabulartitlespec\{column\_spec\}} \\
This macro defines the specification of the column used to render the title of the table.
@@ -662,7 +723,6 @@
The following example of table is obtained by: \\
\begin{verbatim}
\begin{mtabular}[\linewidth]{4}{lXrX}
- \tabulartitle{Example of \texttt{mtabular}}
\tabularheader{Col1}{Col2}{Col3}{Col4}
a & b & c & d \\
\hline
@@ -675,8 +735,7 @@
\end{mtabular}
\end{verbatim}
-\begin{mtabular}[\linewidth]{4}{lXrX}
- \tabulartitle{Example of \texttt{mtabular}}
+\begin{mtabular}[\linewidth]{4}{lXrX}{}
\tabularheader{Col1}{Col2}{Col3}{Col4}
a & b & c & d \\
\hline
@@ -723,8 +782,6 @@
The table~\tabref{example:mtable} page~\tabpageref{example:mtable} is an illustration of the following \LaTeX\ code: \\
\texttt{{\textbackslash}begin\{mtable\}\{{\textbackslash}linewidth\}\{4\}\{lXrX\}\{Example of {\textbackslash}texttt{mtable}\}\{example:mtable\}} \\
-%\texttt{{\textbackslash}tabulartitle\{Example of {\textbackslash}texttt\{mtable\}\}} \\
-\texttt{{\textbackslash}captionastitle} \\
\texttt{{\textbackslash}tabularheader\{Col1\}\{Col2\}\{Col3\}\{Col4\}} \\
\texttt{a \& b \& c \& d {\textbackslash}{\textbackslash}} \\
\texttt{{\textbackslash}hline} \\
@@ -732,8 +789,6 @@
\texttt{{\textbackslash}end\{mtable\}}
\begin{mtable}{\linewidth}{4}{lXrX}{Example of \texttt{mtable}}{example:mtable}
- %\tabulartitle{Example of \texttt{mtable}}
- \captionastitle
\tabularheader{Col1}{Col2}{Col3}{Col4}
a & b & c & d \\
\hline
@@ -740,9 +795,57 @@
e & f & g & h \\
\end{mtable}
-The macro \texttt{{\textbackslash}captionastitle} is equivalent to a call to the macro \texttt{{\textbackslash}tabulartitle} with the caption in parameter.
+\subsection{Table Components}
+The package provides several macros that could help you to configure, update or add a component ot the table.
+\subsubsection{Add a Table Note}
+
+A table note is a note that is rendered below the table and its caption.
+This macro changes the text of the table note.
+
+\paragraph{Syntax} \texttt{{\textbackslash}tablenote\{text\}}
+
+\paragraph{Example} The table~\tabref{example:mtable2} is an illustration of the following \LaTeX\ code: \\
+\texttt{{\textbackslash}begin\{mtable\}\{{\textbackslash}linewidth\}\{4\}\{lXrX\}\{Example of {\textbackslash}texttt{mtable} with a table note\}\{example:mtable2\}} \\
+\texttt{{\textbackslash}tablenote\{This is the text of the note\}} \\
+\texttt{{\textbackslash}tabularheader\{Col1\}\{Col2\}\{Col3\}\{Col4\}} \\
+\texttt{a \& b \& c \& d {\textbackslash}{\textbackslash}} \\
+\texttt{{\textbackslash}hline} \\
+\texttt{e \& f \& g \& h {\textbackslash}{\textbackslash}} \\
+\texttt{{\textbackslash}end\{mtable\}}
+
+\begin{mtable}{\linewidth}{4}{lXrX}{Example of \texttt{mtable} with a table note}{example:mtable2}
+ \tablenote{This is the text of the note}
+ \tabularheader{Col1}{Col2}{Col3}{Col4}
+ a & b & c & d \\
+ \hline
+ e & f & g & h \\
+\end{mtable}
+
+\subsubsection{Add a Table Source}
+
+A table source is a text that is describing the source of the content of the table.
+
+\paragraph{Syntax} \texttt{{\textbackslash}addsource\{text\}}
+
+\paragraph{Example} The table~\tabref{example:mtable3} is an illustration of the following \LaTeX\ code: \\
+\texttt{{\textbackslash}begin\{mtable\}\{{\textbackslash}linewidth\}\{4\}\{lXrX\}\{Example of {\textbackslash}texttt{mtable} with a table source\}\{example:mtable3\}} \\
+\texttt{{\textbackslash}addsource\{This is the source of the content\}} \\
+\texttt{{\textbackslash}tabularheader\{Col1\}\{Col2\}\{Col3\}\{Col4\}} \\
+\texttt{a \& b \& c \& d {\textbackslash}{\textbackslash}} \\
+\texttt{{\textbackslash}hline} \\
+\texttt{e \& f \& g \& h {\textbackslash}{\textbackslash}} \\
+\texttt{{\textbackslash}end\{mtable\}}
+
+\begin{mtable}{\linewidth}{4}{lXrX}{Example of \texttt{mtable} with a table source}{example:mtable3}
+ \addsource{This is the source of the content}
+ \tabularheader{Col1}{Col2}{Col3}{Col4}
+ a & b & c & d \\
+ \hline
+ e & f & g & h \\
+\end{mtable}
+
\section{Enumerations}
The package \texttt{upmethodology-fmt} provides a set of macros dedicated to enumeration lists.
@@ -840,7 +943,9 @@
\section{Environment \texttt{description}}
-The environment \texttt{description} is redefined as following:
+The environment \texttt{description} is redefined as following.
+
+\paragraph{Syntax}
\begin{verbatim}
\begin{description}[separator]
\item[desc] text
@@ -850,7 +955,7 @@
The \texttt{separator} is the text that is inserted at the end of the head of each description item.
-\paragraph{Example~1:} The following \LaTeX~code, using Roman numbers, produces the description just below:
+\paragraph{Example 1} The following \LaTeX~code, using Roman numbers, produces the description just below:
\begin{verbatim}
\begin{description}
\item[first thing] this is a text for the first thing;
@@ -865,7 +970,7 @@
\item[more] etc.
\end{description}
-\paragraph{Example~2:} The following \LaTeX~code produces the description just below:
+\paragraph{Example 2} The following \LaTeX~code produces the description just below:
\begin{verbatim}
\begin{description}[///]
\item[first thing] this is a text for the first thing;
@@ -888,6 +993,8 @@
\subsection{Environment \texttt{enumdescription}}
The environment \texttt{enumdescription} is:
+
+\paragraph{Syntax}
\begin{verbatim}
\begin{enumdescription}[type]
\item[desc] text
@@ -917,7 +1024,7 @@
\renewcommand{\enumdescriptionlabelseparator}{ ... }
\end{verbatim}
-\paragraph{Example~1:} The following \LaTeX~code, using Roman numbers, produces the enumerated description just below:
+\paragraph{Example 1} The following \LaTeX~code, using Roman numbers, produces the enumerated description just below:
\begin{verbatim}
\begin{enumdescription}
\item[first thing] this is a text for the first thing;
@@ -932,7 +1039,7 @@
\item[more] etc.
\end{enumdescription}
-\paragraph{Example~2:} The following \LaTeX~code, using numeric numbers, produces the enumerated description just below:
+\paragraph{Example 2} The following \LaTeX~code, using numeric numbers, produces the enumerated description just below:
\begin{verbatim}
\begin{enumdescription}[1]
\item[first thing] this is a text for the first thing;
@@ -947,7 +1054,7 @@
\item[more] etc.
\end{enumdescription}
-\paragraph{Example~3:} The following \LaTeX~code, using letter numbers, produces the enumerated description just below:
+\paragraph{Example 3} The following \LaTeX~code, using letter numbers, produces the enumerated description just below:
\begin{verbatim}
\begin{enumdescription}[a]
\item[first thing] this is a text for the first thing;
@@ -976,7 +1083,7 @@
\item \texttt{I}: the counter is an upper-case roman number.
\end{itemize}
-\paragraph{Example~1:} The following \LaTeX~code produces a list, which is similar to the one generated by the standard \LaTeX\ environment \texttt{enumerate}:
+\paragraph{Example 1} The following \LaTeX~code produces a list, which is similar to the one generated by the standard \LaTeX\ environment \texttt{enumerate}:
\begin{verbatim}
\begin{enumerate}
\item this is a text for the first thing;
@@ -991,7 +1098,7 @@
\item etc.
\end{enumerate}
-\paragraph{Example~2:} The following \LaTeX~code illustrates how the environment is reacting to a given description:
+\paragraph{Example 2} The following \LaTeX~code illustrates how the environment is reacting to a given description:
\begin{verbatim}
\begin{enumerate}
\item this is a text for the first thing;
@@ -1006,7 +1113,7 @@
\item etc.
\end{enumerate}
-\paragraph{Example~3:} The following \LaTeX~code illustrates the alphabetic counter specification. Note that the parenthesis characters are directly rendered in the list:
+\paragraph{Example 3} The following \LaTeX~code illustrates the alphabetic counter specification. Note that the parenthesis characters are directly rendered in the list:
\begin{verbatim}
\begin{enumerate}[(a)]
\item this is a text for the first thing;
@@ -1021,7 +1128,7 @@
\item etc.
\end{enumerate}
-\paragraph{Example~4:} The following \LaTeX~code illustrates the roman counter specification. Note that the dot character is directly rendered in the list:
+\paragraph{Example 4} The following \LaTeX~code illustrates the roman counter specification. Note that the dot character is directly rendered in the list:
\begin{verbatim}
\begin{enumerate}[I.]
\item this is a text for the first thing;
@@ -1040,8 +1147,7 @@
The environment \texttt{enumdescriptionx} extends the environment \texttt{enumdescription} by enabling a finer configuration with more parameters.
-
-The environment \texttt{enumdescriptionx} is:
+\paragraph{Syntax}
\begin{verbatim}
\begin{enumdescriptionx}[type]{counter\_prefix}{counter\_postfix}
\item[desc] text
@@ -1064,7 +1170,7 @@
\end{verbatim}
-\paragraph{Example:} The following \LaTeX~code, using letter numbers, produces the enumerated description just below:
+\paragraph{Example} The following \LaTeX~code, using letter numbers, produces the enumerated description just below:
\begin{verbatim}
\begin{enumdescriptionx}[a]{$\langle$}{$\rangle$}
\item[first thing] this is a text for the first thing;
@@ -1302,70 +1408,159 @@
Example: \texttt{{\textbackslash}bibsize\{{\textbackslash}Huge\}};
\end{itemize}
-\section{Theorems and Mathematic Environments}
+\section{Theorems and Mathematic Environments}\label{sec:theoremdefinition}
The package \texttt{upmethodology-fmt} defines several environments and macros that are based on the \texttt{theorem} or the math API of \LaTeX.
\subsection{Definition of a new theorem environment}
-If you want to create a new theorem environment based on the style provided by this package, you could invoke \texttt{{\textbackslash}declareupmtheorem}: \\
-\texttt{{\textbackslash}declareupmtheorem[name of the style]\{name\}\{label\}\{title of the list\}}
+The theorem API from this package is based on the standard \texttt{tcolorbox} package.
+If you want to create a new theorem environment based on the style provided by this package, you could invoke \texttt{{\textbackslash}declareupmtheorem}:
+\paragraph{Syntax} \mbox{}\\
+\texttt{{\textbackslash}declareupmtheorem[name of the tcolorbox style]\{name of the \LaTeX\ environment\}\{label of the theorem\}\{title of the theorems' list\}\{prefix for the label keys\}\{name of the theorem's list\}\{macro for formating the source\}}
+
This macro defines:
\begin{itemize}
-\item the environment with the given name, and
-\item the macro \texttt{{\textbackslash}listof$\langle$name$\rangle$s}.
+\item the environment with the given "name of the \LaTeX\ environment", and
+\item the macro \texttt{{\textbackslash}listof$\langle$name of the \LaTeX\ environment$\rangle$s}.
\end{itemize}
-The \texttt{name of the style} is the name of the theorem style to be used. This style is defined by \texttt{{\textbackslash}newtheoremstyle}. By default, it is \texttt{upmdefinition}.
-The \texttt{label} is the text to put in the theorem header.
-The \texttt{title of the list} is used by the macro \texttt{{\textbackslash}listof$\langle$name$\rangle$s} as the title of the chapter.
+The \texttt{name of the tcolorbox style} is the name of the tcolorbox style to be used. This style must be defined according to the \texttt{tcolorbox} package documentation. By default, it is \texttt{upmdefinition}.
-\begin{upmcaution}
- Some features provided by this package depend on the version of the package \texttt{thmtools}. We recommend to use and install the version 2012/05/04, or later.
-\end{upmcaution}
+The \texttt{label of the theorem} is the text to put in the theorem header, e.g., \texttt{Definition}.
+The \texttt{title of the theorems' list} is used by the macro \texttt{{\textbackslash}listof$\langle$name of the \LaTeX\ environment$\rangle$s} as the title of the associated chapter/section.
+
+By default, the theorem environment defines a label for the theorem box. The \texttt{prefix for the label keys} is the prefix that is automatically appended to the label. For example, if this prefix is set to "\texttt{prefix}", and the theorem is invoked with a label value "\texttt{thekey}", then the theorem environment will automatically generate the macro \texttt{{\textbackslash}label\{prefix:thekey\}} in the theorem environment.
+
+The \texttt{name of the theorems' list} is identifier of the list in which the theorem adds entries. This list could be displayed with the macro \texttt{{\textbackslash}listof$\langle$name of the \LaTeX\ environment$\rangle$s}.
+
+The \texttt{macro for formating the source} is \LaTeX\ macro that could be followed by the source text of theorem. It is usually used for formatting this source text in the lower part of the theorem box.
+
\begin{upmcaution}
The macro \texttt{{\textbackslash}declareupmtheorem} can be used only inside the preamble of your document.
\end{upmcaution}
-\paragraph{Example:} The following code define the environment \texttt{mytheorem}:
+\subsection{Using a defined theorem}
+
+After defining an environment, you could use it as a regular \LaTeX\ environment, whitch takes three parameters:
+\begin{itemize}
+\item the title of the theorem in the box,
+\item the key for the implicit \texttt{{\textbackslash}label} macro, and
+\item the optional argument that is the text of the source. The source of the theorem is rendered in the lower part of the theorem box. Usually, it corecponds to the reference to a scientific article or an Internet page.
+\end{itemize}
+
+\paragraph{Example 1} The following code define the environment \texttt{mytheorem} and use it without source text:
\begin{verbatim}
\documentclass{upmethodology-document}
-\declareupmtheorem{mytheorem}{My Theorem}{List of my Theorems}
+\declareupmtheorem{mytheorem}{My Theorem}{List of my Theorems}{thm}{mytheorem}{\textbf}
\begin{document}
-\begin{mytheorem}[Theorem of Everything]
+
+Read the theorem \ref{thm:mytheo}.
+
+\begin{mytheorem}{Theorem of Everything}{mytheo}
This is the theorem of Evereything.
\end{mytheorem}
+
\end{document}
\end{verbatim}
-gives the result:
-\begin{mytheorem}[Theorem of Everything]
+gives the result: \\[.5cm]
+Read the theorem \ref{thm:mytheo1}.
+\begin{mytheorem}{Theorem of Everything}{mytheo1}
This is the theorem of Everything.
\end{mytheorem}
+\paragraph{Example 2} The following code define the environment \texttt{mytheorem} and use it with a source text:
+\begin{verbatim}
+\documentclass{upmethodology-document}
+\declareupmtheorem{mytheorem}{My Theorem}{List of my Theorems}{thm}{mytheorem}{\textbf}
+\begin{document}
+
+Read the theorem \ref{thm:mytheo2}.
+
+\begin{mytheorem}{Theorem of Everything}{mytheo2}[description of the source]
+This is the theorem of Evereything.
+\end{mytheorem}
+
+\end{document}
+\end{verbatim}
+gives the result: \\[.5cm]
+Read the theorem \ref{thm:mytheo2}.
+\begin{mytheorem}{Theorem of Everything}{mytheo2}[description of the source]
+This is the theorem of Everything.
+\end{mytheorem}
+
+\paragraph{Reference the defined theorem} You could add a reference to a defined theorem by using one of the following macros:
+\begin{itemize}
+\item \texttt{{\textbackslash}ref\{$\langle$label of the theorem$\rangle$:$\langle$Label of the theorem$\rangle$\}} for showing the definition's number, e.g., \ref{thm:mytheo2} for the theorem above.
+\item \texttt{{\textbackslash}pageref\{$\langle$label of the theorem$\rangle$:$\langle$Label of the theorem$\rangle$\}} for showing the definition's page, e.g., \pageref{thm:mytheo2} for the theorem above.
+\end{itemize}
+
+\subsection{Using the list of theorems}
+
+When a theorem is defined, the it is possible to creation a chapter (in books or reports) or a section (in articles) that lists all the defined theorems.
+In order to do so, you could use the "listof" macro that is automatically created when defining the theorem.
+The following code define the environment \texttt{mytheorem} and shows the list of defined \texttt{mytheorem}s:
+\begin{verbatim}
+\documentclass{upmethodology-document}
+\declareupmtheorem{mytheorem}{My Theorem}{List of my Theorems}{thm}{mytheorem}{\textbf}
+\begin{document}
+
+\begin{mytheorem}{Theorem of Everything}{mytheo}
+This is the theorem of Evereything.
+\end{mytheorem}
+
+\listofmytheorems
+
+\end{document}
+\end{verbatim}
+
\subsection{\texttt{definition}}
-The package \texttt{upmethodology-fmt} defines the environment \texttt{definition} to put a definition in your document. This environment is based on the standard \texttt{theorem} environment. The \texttt{definition} takes one optional parameter: the name of the definition.
+The package \texttt{upmethodology-fmt} defines the environment \texttt{definition} to put a definition in your document. This environment is based on the \texttt{theorem} environment explained in the previous sections. The \texttt{definition} takes one optional parameter: the name of the definition.
-\paragraph{Example:} The following \LaTeX\ code:
+\paragraph{Example 1} The following \LaTeX\ code:
\begin{verbatim}
-\begin{definition}[Name of the definition]
-Text of the definition.
+\begin{definition}{Name of the definition}{Label of the definition}
+ Text of the definition.
\end{definition}
\end{verbatim}
+
produces:
-\begin{definition}[Name of the definition]
-Text of the definition.
+\begin{definition}{Name of the definition}{Label of the definition}
+ Text of the definition.
\end{definition}
+It is also possible to provide the source of the definition by adding the optional parameter as in the following example.
+
+\paragraph{Example 2}
+\begin{verbatim}
+\begin{definition}{Name of the definition}{Label of the definition}[This is the source]
+ Text of the definition.
+\end{definition}
+\end{verbatim}
+
+The result of this definition declaration is:
+
+\begin{definition}{Name of the definition}{Label of the definition}[This is the source]
+ Text of the definition.
+\end{definition}
+
+\paragraph{Reference the definition} You could add a reference to a definition by using one of the following macros:
+\begin{itemize}
+\item \texttt{{\textbackslash}defref\{$\langle$Label of the definition$\rangle$\}} for showing the definition's number, e.g., \defref{Label of the definition} for the definition above.
+\item \texttt{{\textbackslash}defpageref\{$\langle$Label of the definition$\rangle$\}} for showing the definition's page, e.g., \defpageref{Label of the definition} for the definition above.
+\end{itemize}
+
\paragraph{Change the colors of the definition:} You could change the colors of the \texttt{definition} environment by redefining the colors below with one of the macros \texttt{{\textbackslash}definecolor} or \texttt{{\textbackslash}colorlet}:
\begin{itemize}
\item \texttt{definitionbackground} is the color of the background of the definition;
-\item \texttt{definitionborder} is the color of the frame;
+\item \texttt{definitionborder} is the color of the frame and of the header's background;
\item \texttt{definitionheaderforeground} is the color of the text in the header of the definition;
\item \texttt{definitiontextforeground} is the color of the text in the body of the definition.
+\item \texttt{definitionsourceforeground} is the color of the text in the lower part of the definition in which the source is rendered.
\end{itemize}
\paragraph{Example of color redefinition:} The following \LaTeX\ code:
@@ -1373,25 +1568,27 @@
\definecolor{definitionheaderforeground}{rgb}{.3,.5,.8}
\colorlet{definitionbackground}{gray!20}
\colorlet{definitionborder}{red}
-\begin{definition}[Name of the definition]
-Text of the definition.
+\begin{definition}{Name of the definition}{Label of the definition}
+ Text of the definition.
\end{definition}
\end{verbatim}
+
produces:
\definecolor{definitionheaderforeground}{rgb}{.3,.5,.8}
\colorlet{definitionbackground}{gray!20}
\colorlet{definitionborder}{red}
-\begin{definition}[Name of the definition]
-Text of the definition.
+\begin{definition}{Name of the definition}{Label of the definition}
+ Text of the definition.
\end{definition}
\section{Emphazing Box}
-If you want to create a text that is emphazed with a box, you could use the environment: \\
-\texttt{{\textbackslash}begin\{emphbox\}[width] text {\textbackslash}end\{emphbox\}}
+If you want to create a text that is emphazed with a box, you could use the environment:
-\paragraph{Example:} The following \LaTeX\ code:
+\paragraph{Syntax} \texttt{{\textbackslash}begin\{emphbox\}[width] text {\textbackslash}end\{emphbox\}}
+
+\paragraph{Example} The following \LaTeX\ code:
\begin{verbatim}
\begin{emphbox}[.7\linewidth]
This is an emphazed text.
@@ -1403,7 +1600,7 @@
This is an emphazed text.
\end{emphbox}
-\paragraph{Emphazing Box with a Title:} Three additional boxes are provided. All of them are output a title, and has a different background color: \\
+\paragraph{Emphazing Box with a Title} Three additional boxes are provided. All of them are output a title, and has a different background color: \\
\texttt{{\textbackslash}begin\{titleemphbox\}[width]\{title\} text {\textbackslash}end\{titleemphbox\}} \\
\texttt{{\textbackslash}begin\{titleemphbox2\}[width]\{title\} text {\textbackslash}end\{titleemphbox2\}} \\
\texttt{{\textbackslash}begin\{titleemphbox3\}[width]\{title\} text {\textbackslash}end\{titleemphbox3\}}
@@ -1448,7 +1645,7 @@
-\paragraph{Change the colors of the emphazing box:} You could change the colors of the \texttt{emphbox} environment by redefining the colors below with one of the macros \texttt{{\textbackslash}definecolor} or \texttt{{\textbackslash}colorlet}:
+\paragraph{Change the colors of the emphazing box} You could change the colors of the \texttt{emphbox} environment by redefining the colors below with one of the macros \texttt{{\textbackslash}definecolor} or \texttt{{\textbackslash}colorlet}:
\begin{itemize}
\item \texttt{emphboxbackground} is the color of the background of the environment;
\item \texttt{emphboxborder} is the color of the frame;
@@ -1457,7 +1654,7 @@
\item \texttt{emphboxbackgroundc} is the color of the background of the third environment with title;
\end{itemize}
-\paragraph{Example of color redefinition:} The following \LaTeX\ code:
+\paragraph{Example of color redefinition} The following \LaTeX\ code:
\begin{verbatim}
\colorlet{emphboxbackground}{gray!20}
\colorlet{emphboxborder}{red}
@@ -1476,6 +1673,18 @@
\section{Framed Boxes or Mini Pages}
+There is two API that are available for created framed boxes. The first one is \texttt{tcolorbox}, that is the one use by default in this package. The second approach is based on the \texttt{framedminipage} macros defined in this package.
+
+\subsection{With tcolorbox}
+
+\texttt{tcolorbox} provides an environment for colored and framed text boxes with a heading line. Optionally, such a box can be split in an upper and a lower part. The package
+\texttt{tcolorbox} is included by default, with its \texttt{theorems} extension.
+It can be used for the setting of \LaTeX\ examples where one part of the box displays the source code and the other part shows the output. Another common use case is the setting of theorems (see Section \ref{sec:theoremdefinition}).
+
+More information could be found on \url{https://www.ctan.org/pkg/tcolorbox} or \url{https://github.com/T-F-S/tcolorbox}.
+
+\subsection{With framedminipage}
+
Standard \LaTeX\ distribution provides the \texttt{minipage} environment. This environment allows you to put a small piece of page inside your document. The package \texttt{upmethodology-fmt} provides two framed extensions of the original \texttt{minipage} environment: \texttt{framedminipage} and \texttt{framedcolorminipage}.
The prototypes of there two new environments are, respectively:
@@ -1514,26 +1723,40 @@
\begin{tabularx}{\linewidth}{XX}
\texttt{{\textbackslash}begin\{upmcaution\}{[}width{]}} \newline
-\texttt{This is an example of a caution message. This text must be rendered with enough height (usually 2 lines of text) to avoid intersection between the caution icon and the box frame.} \newline
+\texttt{This is an example of a caution message.} \newline
\texttt{{\textbackslash}end\{upmcaution\}}
&
-\begin{upmcaution}This is an example of a caution message. This text must be rendered with enough height (usually 2 lines of text) to avoid intersection between the caution icon and the box frame.\end{upmcaution}
+\raisebox{-\height}{\begin{upmcaution}This is an example of a caution message.\end{upmcaution}}
\\
\texttt{{\textbackslash}begin\{upminfo\}{[}width{]}} \newline
-\texttt{This is an example of an information message. This text must be rendered with enough height (usually 2 lines of text) to avoid intersection between the caution icon and the box frame.} \newline
+\texttt{This is an example of an information message.} \newline
\texttt{{\textbackslash}end\{upminfo\}}
&
-\begin{upminfo}This is an example of an information message. This text must be rendered with enough height (usually 2 lines of text) to avoid intersection between the caution icon and the box frame.\end{upminfo}
+\raisebox{-\height}{\begin{upminfo}This is an example of an information message.\end{upminfo}}
\\
+\texttt{{\textbackslash}begin\{upmnote\}{[}width{]}} \newline
+\texttt{This is an example of a note message.} \newline
+\texttt{{\textbackslash}end\{upmnote\}}
+&
+\raisebox{-\height}{\begin{upmnote}This is an example of a note message.\end{upmnote}}
+\\
+
\texttt{{\textbackslash}begin\{upmquestion\}{[}width{]}} \newline
-\texttt{This is an example of a question message. This text must be rendered with enough height (usually 2 lines of text) to avoid intersection between the caution icon and the box frame.} \newline
+\texttt{This is an example of a question message.} \newline
\texttt{{\textbackslash}end\{upmquestion\}}
&
-\begin{upmquestion}This is an example of a question message. This text must be rendered with enough height (usually 2 lines of text) to avoid intersection between the caution icon and the box frame.\end{upmquestion}
+\raisebox{-\height}{\begin{upmquestion}This is an example of a question message.\end{upmquestion}}
\\
+\texttt{{\textbackslash}begin\{upmaction\}{[}width{]}} \newline
+\texttt{This is an example of an action message.} \newline
+\texttt{{\textbackslash}end\{upmaction\}}
+&
+\raisebox{-\height}{\begin{upmaction}This is an example of an action message.\end{upmaction}}
+\\
+
\end{tabularx}
\section{Additional Macros for the Table of Content}
@@ -1549,10 +1772,12 @@
If you want to add a document part that has no part number but appearing inside the table of content, the classical \LaTeX\ macros \texttt{{\textbackslash}part} and \texttt{{\textbackslash}part*} are inefficient. Indeed, \texttt{{\textbackslash}part} is adding a numbered part inside the table of content, and \texttt{{\textbackslash}part*} is adding an unnumbered part but not inside the table of content.
-To add an unnumbered part inside the table of content, you could use one of the macros: \\
-\texttt{{\textbackslash}parttoc[toctitle]\{title\}} \\
-\texttt{{\textbackslash}parttoc*[toctitle]\{title\}}
+To add an unnumbered part inside the table of content, you could use one of the macros:
+\paragraph{Syntax 1} \texttt{{\textbackslash}parttoc[toctitle]\{title\}}
+
+\paragraph{Syntax 2} \texttt{{\textbackslash}parttoc*[toctitle]\{title\}}
+
The macros \texttt{{\textbackslash}parttoc} and \texttt{{\textbackslash}parttoc*} have the same effect except that \texttt{{\textbackslash}parttoc*} aligns the part's title to the other numbered parts' titles; and \texttt{{\textbackslash}parttoc} not.
\subsection{Non-numbered Chapter in Table of Content}
@@ -1559,10 +1784,12 @@
If you want to add a document chapter that has no chapter number but appearing inside the table of content, the classical \LaTeX\ macros \texttt{{\textbackslash}chapter} and \texttt{{\textbackslash}chapter*} are inefficient. Indeed, \texttt{{\textbackslash}chapter} is adding a numbered chapter inside the table of content, and \texttt{{\textbackslash}chapter*} is adding an unnumbered chapter but not inside the table of content.
-To add an unnumbered chapter inside the table of content, you could use one of the macros: \\
-\texttt{{\textbackslash}chaptertoc[toctitle]\{title\}} \\
-\texttt{{\textbackslash}chaptertoc*[toctitle]\{title\}}
+To add an unnumbered chapter inside the table of content, you could use one of the macros:
+\paragraph{Syntax 1} \texttt{{\textbackslash}chaptertoc[toctitle]\{title\}}
+
+\paragraph{Syntax 2} \texttt{{\textbackslash}chaptertoc*[toctitle]\{title\}}
+
The macros \texttt{{\textbackslash}chaptertoc} and \texttt{{\textbackslash}chaptertoc*} have the same effect except that \texttt{{\textbackslash}chaptertoc*} aligns the chapter's title to the other numbered chapters' titles; and \texttt{{\textbackslash}chaptertoc} not.
\subsection{Non-numbered Section in Table of Content}
@@ -1569,10 +1796,12 @@
If you want to add a document section that has no a section number but appearing inside the table of content, the classical \LaTeX\ macros \texttt{{\textbackslash}section} and \texttt{{\textbackslash}section*} are inefficient. Indeed, \texttt{{\textbackslash}section} add a numbered section inside the table of content, and \texttt{{\textbackslash}section*} adds an unnumbered section but not inside the table of content.
-To add an unnumbered section inside the table of content, you could use one of the macros: \\
-\texttt{{\textbackslash}sectiontoc[toctitle]\{title\}} \\
-\texttt{{\textbackslash}sectiontoc*[toctitle]\{title\}}
+To add an unnumbered section inside the table of content, you could use one of the macros:
+\paragraph{Syntax 1} \texttt{{\textbackslash}sectiontoc[toctitle]\{title\}}
+
+\paragraph{Syntax 2} \texttt{{\textbackslash}sectiontoc*[toctitle]\{title\}}
+
The macros \texttt{{\textbackslash}sectiontoc} and \texttt{{\textbackslash}sectiontoc*} have the same effect except that \texttt{{\textbackslash}sectiontoc*} aligns the section's title to the other numbered sections' titles; and \texttt{{\textbackslash}sectiontoc} not.
\subsection{Non-numbered Subsection in Table of Content}
@@ -1579,10 +1808,12 @@
If you want to add a document subsection that has no subsection number but appearing inside the table of content, the classical \LaTeX\ macros \texttt{{\textbackslash}subsection} and \texttt{{\textbackslash}subsection*} are inefficient. Indeed, \texttt{{\textbackslash}subsection} is adding a numbered subsection inside the table of content, and \texttt{{\textbackslash}subsection*} is adding an unnumbered subsection but not inside the table of content.
-To add an unnumbered subsection inside the table of content, you could use one of the macros: \\
-\texttt{{\textbackslash}subsectiontoc[toctitle]\{title\}} \\
-\texttt{{\textbackslash}subsectiontoc*[toctitle]\{title\}}
+To add an unnumbered subsection inside the table of content, you could use one of the macros:
+\paragraph{Syntax 1} \texttt{{\textbackslash}subsectiontoc[toctitle]\{title\}}
+
+\paragraph{Syntax 2} \texttt{{\textbackslash}subsectiontoc*[toctitle]\{title\}}
+
The macros \texttt{{\textbackslash}subsectiontoc} and \texttt{{\textbackslash}subsectiontoc*} have the same effect except that \texttt{{\textbackslash}subsectiontoc*} aligns the subsection's title to the other numbered subsections' titles; and \texttt{{\textbackslash}subsectiontoc} not.
\subsection{Non-numbered Subsubsection in Table of Content}
@@ -1589,10 +1820,12 @@
If you want to add a document subsubsection that has no subsubsection number but appearing inside the table of content, the classical \LaTeX\ macros \texttt{{\textbackslash}subsubsection} and \texttt{{\textbackslash}subsubsection*} are inefficient. Indeed, \texttt{{\textbackslash}subsubsection} is adding a numbered subsubsection inside the table of content, and \texttt{{\textbackslash}subsubsection*} is adding an unnumbered subsubsection but not inside the table of content.
-To add an unnumbered subsubsection inside the table of content, you could use one of the macros: \\
-\texttt{{\textbackslash}subsubsectiontoc[toctitle]\{title\}} \\
-\texttt{{\textbackslash}subsubsectiontoc*[toctitle]\{title\}}
+To add an unnumbered subsubsection inside the table of content, you could use one of the macros:
+\paragraph{Syntax 1} \texttt{{\textbackslash}subsubsectiontoc[toctitle]\{title\}}
+
+\paragraph{Syntax 2} \texttt{{\textbackslash}subsubsectiontoc*[toctitle]\{title\}}
+
The macros \texttt{{\textbackslash}subsubsectiontoc} and \texttt{{\textbackslash}subsubsectiontoc*} have the same effect except that \texttt{{\textbackslash}subsubsectiontoc*} aligns the subsubsection's title to the other numbered subsubsections' titles; and \texttt{{\textbackslash}subsubsectiontoc} not.
\subsection{Chapter with different labels in TOC, headers and document}
@@ -1599,8 +1832,7 @@
If you want to control the labels in the table of contents (TOC), the headers and the document for a chapter, the classical \LaTeX\ macros \texttt{{\textbackslash}chapter} and \texttt{{\textbackslash}chapter*} are inefficient.
-To control these labels, you could use the macro: \\
-\texttt{{\textbackslash}chapterfull[toctitle]\{title\}\{headertitle\}}
+\paragraph{Syntax} \texttt{{\textbackslash}chapterfull[toctitle]\{title\}\{headertitle\}}
The macro create a chapter with the given label ``\texttt{title}'' in the core part of the document, with the given label ``\texttt{toctitle}'' in the table of contents, and with the label ``\texttt{headertitle}'' in the headers.
@@ -1608,8 +1840,7 @@
If you want to control the labels in the table of contents (TOC), the headers and the document for a section, the classical \LaTeX\ macros \texttt{{\textbackslash}section} and \texttt{{\textbackslash}section*} are inefficient.
-To control these labels, you could use the macro: \\
-\texttt{{\textbackslash}sectionfull[toctitle]\{title\}\{headertitle\}}
+\paragraph{Syntax} \texttt{{\textbackslash}sectionfull[toctitle]\{title\}\{headertitle\}}
The macro create a section with the given label ``\texttt{title}'' in the core part of the document, with the given label ``\texttt{toctitle}'' in the table of contents, and with the label ``\texttt{headertitle}'' in the headers.
Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def 2025-03-16 19:57:13 UTC (rev 74650)
@@ -1 +1 @@
-\def\UPMVERSION{20250311}
+\def\UPMVERSION{20250315}
Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-backpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-backpage.sty 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-backpage.sty 2025-03-16 19:57:13 UTC (rev 74650)
@@ -17,7 +17,7 @@
% write to the Free Software Foundation, Inc., 59 Temple Place - Suite
% 330, Boston, MA 02111-1307, USA.
-\global\edef\upm at package@bp at ver{2025/03/11}
+\global\edef\upm at package@bp at ver{2025/03/15}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-backpage}[\upm at package@bp at ver]
Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-code.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-code.sty 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-code.sty 2025-03-16 19:57:13 UTC (rev 74650)
@@ -22,7 +22,7 @@
% 2009-10-30 Clean code.
%
-\global\edef\upm at package@code at ver{2025/03/11}
+\global\edef\upm at package@code at ver{2025/03/15}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-code}[\upm at package@code at ver]
Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls 2025-03-16 19:57:13 UTC (rev 74650)
@@ -17,7 +17,7 @@
% write to the Free Software Foundation, Inc., 59 Temple Place - Suite
% 330, Boston, MA 02111-1307, USA.
-\global\edef\upm at package@docclazz at ver{2025/03/11}
+\global\edef\upm at package@docclazz at ver{2025/03/15}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{upmethodology-document}[\upm at package@docclazz at ver]
Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty 2025-03-16 19:57:13 UTC (rev 74650)
@@ -17,7 +17,7 @@
% write to the Free Software Foundation, Inc., 59 Temple Place - Suite
% 330, Boston, MA 02111-1307, USA.
-\global\edef\upm at package@doc at ver{2025/03/11}
+\global\edef\upm at package@doc at ver{2025/03/15}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-document}[\upm at package@doc at ver]
@@ -158,8 +158,7 @@
% Display the summary of the document
%\upmdocumentsummary[width]
\newcommand{\upmdocumentsummary}[1][\linewidth]{%
- \noindent\begin{mtabular}[#1]{2}{|l|X|}%
- \tabulartitle{\upm at lang@document at summary}%
+ \noindent\begin{mtabular}[#1]{2}{|l|X|}{\upm at lang@document at summary}%
\upm at lang@project & \theupmproject\Ifnotempty{\theupmsubproject}{ -- \theupmsubproject} \\
\upm at lang@document & \theupmdocname \\
\upm at lang@docref & \theupmdocref \\
@@ -339,8 +338,7 @@
\newcommand{\upmdocumentauthors}[1][\linewidth]{%
\ifupm at document@author at tab@hascomment%
\Ifnotempty{\upm at document@author at tab@commented}{%
- \noindent\expandafter\begin{mtabular}[#1]{3}{|X|l|c|}%
- \tabulartitle{\upm at lang@document at authors}%
+ \noindent\expandafter\begin{mtabular}[#1]{3}{|X|l|c|}{\upm at lang@document at authors}%
\tabularheader{\upm at lang@document at names}{\upm at lang@document at comments}{\upm at lang@document at emails}%
\upm at document@author at tab@commented
\hline%
@@ -347,8 +345,7 @@
\expandafter\end{mtabular}\par\vspace{.5cm}}%
\else%
\Ifnotempty{\upm at document@author at tab}{%
- \noindent\expandafter\begin{mtabular}[#1]{2}{|X|c|}%
- \tabulartitle{\upm at lang@document at authors}%
+ \noindent\expandafter\begin{mtabular}[#1]{2}{|X|c|}{\upm at lang@document at authors}%
\tabularheader{\upm at lang@document at names}{\upm at lang@document at emails}%
\upm at document@author at tab
\hline%
@@ -401,8 +398,7 @@
\newcommand{\upmdocumentvalidators}[1][\linewidth]{%
\ifupm at document@validator at tab@hascomment%
\Ifnotempty{\upm at document@validator at tab@commented}{%
- \noindent\expandafter\begin{mtabular}[#1]{4}{|X|l|c|p{3cm}|}%
- \tabulartitle{\upm at lang@document at validators}%
+ \noindent\expandafter\begin{mtabular}[#1]{4}{|X|l|c|p{3cm}|}{\upm at lang@document at validators}%
\tabularheader{\upm at lang@document at names}{\upm at lang@document at comments}{\upm at lang@document at emails}{\upm at lang@document at initials}%
\upm at document@validator at tab@commented
\hline%
@@ -409,8 +405,7 @@
\expandafter\end{mtabular}\par\vspace{.5cm}}%
\else%
\Ifnotempty{\upm at document@validator at tab}{%
- \noindent\expandafter\begin{mtabular}[#1]{3}{|X|c|p{3cm}|}%
- \tabulartitle{\upm at lang@document at validators}%
+ \noindent\expandafter\begin{mtabular}[#1]{3}{|X|c|p{3cm}|}{\upm at lang@document at validators}%
\tabularheader{\upm at lang@document at names}{\upm at lang@document at emails}{\upm at lang@document at initials}%
\upm at document@validator at tab
\hline%
@@ -476,8 +471,7 @@
\newcommand{\upmdocumentinformedpeople}[1][\linewidth]{%
\ifupm at document@validator at tab@hascomment%
\Ifnotempty{\upm at document@informed at tab@commented}{%
- \noindent\expandafter\begin{mtabular}[#1]{3}{|X|l|c|}%
- \tabulartitle{\upm at lang@document at informed}%
+ \noindent\expandafter\begin{mtabular}[#1]{3}{|X|l|c|}{\upm at lang@document at informed}%
\tabularheader{\upm at lang@document at names}{\upm at lang@document at comments}{\upm at lang@document at emails}%
\upm at document@informed at tab@commented
\hline%
@@ -484,8 +478,7 @@
\expandafter\end{mtabular}\par\vspace{.5cm}}%
\else%
\Ifnotempty{\upm at document@informed at tab}{%
- \noindent\expandafter\begin{mtabular}[#1]{2}{|X|c|}%
- \tabulartitle{\upm at lang@document at informed}%
+ \noindent\expandafter\begin{mtabular}[#1]{2}{|X|c|}{\upm at lang@document at informed}%
\tabularheader{\upm at lang@document at names}{\upm at lang@document at emails}%
\upm at document@informed at tab
\hline%
Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty 2025-03-16 19:57:13 UTC (rev 74650)
@@ -18,7 +18,7 @@
% 330, Boston, MA 02111-1307, USA.
%
-\global\edef\upm at package@ext at ver{2025/03/11}
+\global\edef\upm at package@ext at ver{2025/03/15}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-extension}[\upm at package@ext at ver]
Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty 2025-03-16 19:57:13 UTC (rev 74650)
@@ -17,7 +17,7 @@
% write to the Free Software Foundation, Inc., 59 Temple Place - Suite
% 330, Boston, MA 02111-1307, USA.
-\global\edef\upm at package@fmt at ver{2025/03/11}
+\global\edef\upm at package@fmt at ver{2025/03/15}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-fmt}[\upm at package@fmt at ver]
@@ -50,6 +50,10 @@
\gdef\upm at format@lang at mdoctor{M.D.}%
\gdef\upm at format@lang at professionalengineer{CEng.}%
\gdef\upm at format@lang at incorporatedengineer{IEng.}%
+ \gdef\upm at format@lang at listofalgorithms{List of Algorithms}%
+ \gdef\upm at format@lang at listoffigures{List of Figures}%
+ \gdef\upm at format@lang at sourcename{Source}%
+ \gdef\upm at format@lang at colonchar{:\xspace}%
}
\def\upm at format@lang at french{%
\gdef\upm at lang@@{\message{**** upmethodology-fmt is using French language ****}}%
@@ -64,6 +68,10 @@
\gdef\upm at format@lang at mdoctor{M.D.}%
\gdef\upm at format@lang at professionalengineer{Ing.}%
\gdef\upm at format@lang at incorporatedengineer{Ing.}%
+ \gdef\upm at format@lang at listofalgorithms{Liste des algorithmes}%
+ \gdef\upm at format@lang at listoffigures{Liste des figures}%
+ \gdef\upm at format@lang at sourcename{Source}%
+ \gdef\upm at format@lang at colonchar{\;:\xspace}%
}
\global\providecommand{\upm at format@lang at makedate}[3]{}%
@@ -96,6 +104,7 @@
\RequirePackage{tabularx}
\RequirePackage{multicol}
\RequirePackage{colortbl}
+\RequirePackage{tcolorbox}
\RequirePackage{picinpar}
\RequirePackage{amsmath}
\RequirePackage{amsthm}
@@ -111,7 +120,10 @@
\RequirePackage{environ}% for advanced environment declaration
\RequirePackage{xcolor}
\RequirePackage{tikz}
+\RequirePackage{fontawesome5}
+\RequirePackage{tocbibind} % To automatically the common "Listof" in the outline
+
%----------------------------------------
% Exponent and indice
%----------------------------------------
@@ -182,26 +194,81 @@
% FIGURES
%----------------------------------------
-\newcommand{\upm at mfigure}[5][ht]{
- \begin{figure}[#1]%
- \begin{center}%
- \includegraphics[#2]{#3}%
- \caption{#4}%
- \label{fig:#5}%
- \end{center}%
- \end{figure}%
+\colorlet{figuresourceforeground}{gray}
+\global\let\figuresourcename\upm at format@lang at sourcename
+\newcommand{\mfigureformatsource}[1]{%
+ \centering\textcolor{figuresourceforeground}{\smaller\textit{#1}}%
+}%
+\newcommand{\upm at mfigure@formatsource}[1]{%
+ \\ \mfigureformatsource{\figuresourcename\upm at format@lang at colonchar{#1}}%
}
-\newcommand{\upm at mfigurestar}[5][ht]{
- \begin{figure*}[#1]%
- \begin{center}%
- \includegraphics[#2]{#3}%
- \caption{#4}%
- \label{fig:#5}%
- \end{center}%
- \end{figure*}%
+\newcommand{\upm at mfigure@internal@}[7]{%
+ \begin{#7}[#1]%
+ \begin{center}%
+ \protect\includegraphics[#2]{#3}%
+ \protect\caption{#4#6}%
+ \protect\label{fig:#5}%
+ \end{center}%
+ \end{#7}%
}
+
+\newcommand{\upm at mfigure@internal}{%
+ \protected at edef\upm at tmp{
+ \protect\upm at mfigure@internal@%
+ {\upm at mfigure@arga}%
+ {\upm at mfigure@argb}%
+ {\upm at mfigure@argc}%
+ {\upm at mfigure@argd}%
+ {\upm at mfigure@arge}%
+ {\upm at mfigure@argf}%
+ {figure}%
+ }%
+ \upm at tmp%
+}
+\gdef\upm at mfigure@sourcetext at reader[#1]{%
+ \gdef\upm at mfigure@argf{\upm at mfigure@formatsource{#1}}\upm at mfigure@internal%
+}
+\newcommand{\upm at mfigure}[5][ht]{%
+ \gdef\upm at mfigure@arga{#1}%
+ \gdef\upm at mfigure@argb{#2}%
+ \gdef\upm at mfigure@argc{#3}%
+ \gdef\upm at mfigure@argd{#4}%
+ \gdef\upm at mfigure@arge{#5}%
+ \global\let\upm at mfigure@argf\@empty%
+ \@ifnextchar[%
+ \upm at mfigure@sourcetext at reader%
+ \upm at mfigure@internal%
+}
+
+\newcommand{\upm at mfigurestar@internal}{%
+ \protected at edef\upm at tmp{
+ \protect\upm at mfigure@internal@%
+ {\upm at mfigure@arga}%
+ {\upm at mfigure@argb}%
+ {\upm at mfigure@argc}%
+ {\protect\upm at mfigure@argd}%
+ {\upm at mfigure@arge}%
+ {\protect\upm at mfigure@argf}%
+ {figure*}%
+ }%
+ \upm at tmp%
+}
+\gdef\upm at mfigurestar@sourcetext at reader[#1]{%
+ \gdef\upm at mfigure@argf{\upm at mfigure@formatsource{#1}}\upm at mfigurestar@internal%
+}
+\newcommand{\upm at mfigurestar}[5][ht]{%
+ \gdef\upm at mfigure@arga{#1}%
+ \gdef\upm at mfigure@argb{#2}%
+ \gdef\upm at mfigure@argc{#3}%
+ \gdef\upm at mfigure@argd{#4}%
+ \gdef\upm at mfigure@arge{#5}%
+ \global\let\upm at mfigure@argf\@empty%
+ \@ifnextchar[%
+ \upm at mfigurestar@sourcetext at reader%
+ \upm at mfigurestar@internal%
+}
%-----
-%\mfigure[position]{options}{filename}{caption}{label}
+%\mfigure[position]{options}{filename}{caption}{label}[source]
\def\mfigure{\@ifstar\upm at mfigurestar\upm at mfigure}
%-----
%\figref{label}
@@ -411,15 +478,38 @@
%----------------------------------------
%table's colors
-\definecolor{backtableheader}{rgb}{0.92,0.94,1}
-\definecolor{fronttableheader}{rgb}{0.23,0.33,0.48}
+\definecolor{tableheaderbackground}{rgb}{0.92,0.94,1}
+\definecolor{tableheaderforeground}{rgb}{0.23,0.33,0.48}
+\colorlet{tablebackground}{white}
+\colorlet{tableforeground}{black}
+\colorlet{tablerule}{tableheaderbackground}
+
+\AtBeginDocument{%
+ \arrayrulecolor{tablerule}%
+}
+
+\tcbset{
+ mtabular/.style={
+ attach title,
+ colbacktitle=tableheaderbackground,
+ coltitle=tableheaderforeground,
+ colback=tablebackground,
+ colframe=tablerule,
+ coltext=tableforeground,
+ rounded corners,
+ before upper=\tcbtitle,
+ fonttitle=\bfseries,
+ halign title=center,
+ }
+}
+
%title of a table
-\def\upm at fmt@table at title#1{\color{fronttableheader} \cellcolor{backtableheader} {\bfseries #1}}
+\def\upm at fmt@table at title#1{\color{tableheaderforeground} \cellcolor{tableheaderbackground} {\bfseries #1}}
%title of columns
\newcommand{\tabularheaderstyle}[1]{%
- \mbox{}{\cellcolor{backtableheader} {\color{fronttableheader}\itshape\ignorespaces#1}}%
+ \mbox{}{\cellcolor{tableheaderbackground} {\color{tableheaderforeground}\itshape\ignorespaces#1}}%
}%
-\def\upm at fmt@table at column@title#1{\hfil{\color{fronttableheader} \cellcolor{backtableheader} {\itshape#1}}\hfil}
+\def\upm at fmt@table at column@title#1{\hfil{\color{tableheaderforeground} \cellcolor{tableheaderbackground} {\itshape#1}}\hfil}
% Utility functions for mtabular
\newcounter{upm at fmt@mtabular at columnnumber}
@@ -435,52 +525,55 @@
}
%-----
-%\mtabular[width]{ncolumns}{columns}
-\newenvironment{mtabular}[3][\linewidth]{%
- \newcommand{\tabulartitle}[1]{%
- \hline%
- \upm at fmt@mtabular at expandtitle{#2}{##1} \\%
- \hline%
- }%
- \newcommand{\tabulartitleinside}[1]{%
- \hline\hline%
- \upm at fmt@mtabular at expandtitle{#2}{##1} \\%
- \hline%
- }%
- \newcommand*{\upm at fmt@mtabular at column@next}[1]{%
- & \upm at fmt@table at column@title{\ignorespaces##1\ignorespaces}%
- \addtocounter{upm at fmt@mtabular at columnnumber}{-1}%
- \ifnum0<\value{upm at fmt@mtabular at columnnumber}%
- \let\upm at fmt@mtabular at column@continue\upm at fmt@mtabular at column@next%
- \else%
- \\ \hline \let\upm at fmt@mtabular at column@continue\ignorespaces%
- \fi%
- \upm at fmt@mtabular at column@continue%
- }
- \newcommand*{\upm at fmt@mtabular at column@first}[1]{%
- \upm at fmt@table at column@title{\ignorespaces##1\ignorespaces}%
- \addtocounter{upm at fmt@mtabular at columnnumber}{-1}%
- \ifnum0<\value{upm at fmt@mtabular at columnnumber}%
- \let\upm at fmt@mtabular at column@continue\upm at fmt@mtabular at column@next%
- \else%
- \\ \hline \let\upm at fmt@mtabular at column@continue\ignorespaces%
- \fi%
- \upm at fmt@mtabular at column@continue%
- }
- \newcommand{\tabularheader}{%
- \setcounter{upm at fmt@mtabular at columnnumber}{#2}%
- \upm at fmt@mtabular at column@first%
- }%
- \newcommand{\tabularrowheader}[1]{%
- \centering\upm at fmt@table at column@title{\ignorespaces##1}%
- }%
- \begingroup\tabularx{#1}{#3}%
-}{%
- \endtabularx\endgroup%
+%\mtabular[width]{ncolumns}{columns}{table title}
+\global\NewEnviron{mtabular}[4][\linewidth]{%
+ \newcommand*{\upm at fmt@mtabular at column@next}[1]{%
+ & \upm at fmt@table at column@title{\ignorespaces##1\ignorespaces}%
+ \addtocounter{upm at fmt@mtabular at columnnumber}{-1}%
+ \ifnum0<\value{upm at fmt@mtabular at columnnumber}%
+ \let\upm at fmt@mtabular at column@continue\upm at fmt@mtabular at column@next%
+ \else%
+ \\ \hline \let\upm at fmt@mtabular at column@continue\ignorespaces%
+ \fi%
+ \upm at fmt@mtabular at column@continue%
+ }
+ \newcommand*{\upm at fmt@mtabular at column@first}[1]{%
+ \upm at fmt@table at column@title{\ignorespaces##1\ignorespaces}%
+ \addtocounter{upm at fmt@mtabular at columnnumber}{-1}%
+ \ifnum0<\value{upm at fmt@mtabular at columnnumber}%
+ \let\upm at fmt@mtabular at column@continue\upm at fmt@mtabular at column@next%
+ \else%
+ \\ \hline \let\upm at fmt@mtabular at column@continue\ignorespaces%
+ \fi%
+ \upm at fmt@mtabular at column@continue%
+ }
+ \newcommand{\tabularheader}{%
+ \setcounter{upm at fmt@mtabular at columnnumber}{#2}%
+ \upm at fmt@mtabular at column@first%
+ }%
+ \newcommand{\tabulartitle}[1]{%
+ \errmessage{The macro {\string\tabulartitle} is deprecated. Replace by the argument}%
+ }%
+ \newcommand{\tabulartitleinside}[1]{%
+ \hline\hline%
+ \upm at fmt@mtabular at expandtitle{#2}{##1} \\%
+ \hline%
+ }%
+ \newcommand{\tabularrowheader}[1]{%
+ \centering\upm at fmt@table at column@title{\ignorespaces##1}%
+ }%
+ \begin{tcolorbox}[mtabular,tabularx={#3},title={#4}]%
+ \BODY%
+ \end{tcolorbox}%
}
+\newcommand{\upm at mtable@formatsource}[1]{%
+ \mbox{}\\ \mfigureformatsource{\figuresourcename\upm at format@lang at colonchar{#1}}%
+}
+\gdef\upm at table@source{}
+
%-----
-%\mtable[options]{width}{ncolumns}{columns}{caption}{label}
+%\mtable[options]{width}{ncolumns}{columns}{caption}{label}[source text]
% size=<length>
\define at key[autolatex]{mtable}{size}{\gdef\@autolatex at mtable@size{#1}}
% position: h t b p H !
@@ -525,28 +618,34 @@
\define at key[autolatex]{mtable}{htbpH!}[\relax]{\gdef\@autolatex at mtable@position{[htbpH!]}}
%
\newenvironment{mtable}[6][ht]{%
- \gdef\@autolatex at mtable@position{[ht]}%
- \gdef\@autolatex at mtable@size{\normalsize}%
- \setkeys[autolatex]{mtable}{#1}%
- %
- \gdef\upm at table@caption{#5}%
- \xdef\upm at table@label{tab:#6}%
- \gdef\upm at table@note{}%
- \newcommand{\captionastitle}{\tabulartitle{\upm at table@caption}}%
- \newcommand{\tablenote}[1]{\gdef\upm at table@note{\bgroup ##1\egroup}}%
- \expandafter\table\@autolatex at mtable@position%
- \center\@autolatex at mtable@size%
- \mtabular[#2]{#3}{#4}%
+ \gdef\@autolatex at mtable@position{[ht]}%
+ \gdef\@autolatex at mtable@size{\normalsize}%
+ \setkeys[autolatex]{mtable}{#1}%
+ %
+ \gdef\upm at table@source{}%
+ \gdef\upm at table@caption{#5}%
+ \xdef\upm at table@label{tab:#6}%
+ \gdef\upm at table@note{}%
+ \newcommand{\captionastitle}{
+ \errmessage{The macro {\string\captionastitle} is deprecated. Replace by the argument}%
+ }%
+ \newcommand{\tablenote}[1]{\gdef\upm at table@note{\bgroup ##1\egroup}}%
+ \newcommand{\addsource}[1]{\gdef\upm at table@source{\upm at mtable@formatsource{\bgroup ##1 \egroup}}}%
+ %%
+ \expandafter\table\@autolatex at mtable@position%
+ \center\@autolatex at mtable@size%
+ \mtabular[#2]{#3}{#4}{}%
}{%
- \endmtabular\relax%
- \caption{\upm at table@caption}%
- \label{\upm at table@label}%
- \endcenter%
- \upm at table@note%
- \endtable%
- \global\let\upm at table@caption\relax%
- \global\let\upm at table@label\relax%
- \global\let\upm at table@note\relax%
+ \endmtabular\relax%
+ \caption{\upm at table@caption\upm at table@source}%
+ \label{\upm at table@label}%
+ \endcenter%
+ \upm at table@note%
+ \endtable%
+ \global\let\upm at table@caption\relax%
+ \global\let\upm at table@label\relax%
+ \global\let\upm at table@note\relax%
+ \global\let\upm at mtable@optionalarg at value\relax%
}
%-----
@@ -587,7 +686,7 @@
\gdef\upm at format@parttitle#1{\textcolor{parttitlecolor}{\huge\scshape #1}}
\gdef\upm at format@chapternum{\color{chaptertitlenumcolor}\fontsize{90}{40}\sffamily\bfseries}
-\gdef\upm at format@chaptertitle#1{\textcolor{chaptertitlecolor}{\Huge\scshape\sffamily\bfseries #1}}
+\gdef\upm at format@chaptertitle#1{\setstretch{2.5}\textcolor{chaptertitlecolor}{\Huge\scshape\sffamily\bfseries #1}}
\gdef\upm at format@sectionnum#1{#1}
\gdef\upm at format@sectiontitle{\normalfont\sffamily\large\bfseries\color{sectiontitlecolor}}
@@ -768,8 +867,8 @@
%\chaptertoc [toctitle]{title} % left-alignment inside TOC
%\chaptertoc*[toctitle]{title} % right-alignment inside TOC
\def\chaptertoc{\@ifstar%
- {\gdef\upm at format@newsection at alignment{\protect\numberline{}}\expandafter\upm at format@newsection at chapter}%
- {\gdef\upm at format@newsection at alignment{}\expandafter\upm at format@newsection at chapter}}
+ {\gdef\upm at format@newsection at alignment{\protect\numberline{}}\expandafter\upm at format@newsection at chapter}%
+ {\gdef\upm at format@newsection at alignment{}\expandafter\upm at format@newsection at chapter}}
\def\upm at format@newsection at chapter{\@ifnextchar[%
{\upm at format@newsection at chapter@a}%
@@ -792,6 +891,26 @@
}%
}
+\def\@chaptertoc{\@ifstar\upm at chaptertoc@a\upm at chaptertoc@b}
+\def\upm at chaptertoc@a[#1]#2{%
+ \chapter*[#1]{#2}%
+ \addcontentsline{toc}{chapter}{#2}%
+}
+\def\upm at chaptertoc@b#1{%
+ \chapter*{#1}%
+ \addcontentsline{toc}{chapter}{#1}%
+}
+
+\def\@sectiontoc{\@ifstar\upm at sectiontoc@a\upm at sectiontoc@b}
+\def\upm at sectiontoc@a[#1]#2{%
+ \section*[#1]{#2}%
+ \addcontentsline{toc}{section}{#2}%
+}
+\def\upm at sectiontoc@b#1{%
+ \section*{#1}%
+ \addcontentsline{toc}{section}{#1}%
+}
+
%-----
% Section without number but inside the TOC
%\sectiontoc [toctitle]{title} % left-alignment inside TOC
@@ -891,6 +1010,22 @@
\global\sectionmark{#2}%
}
+%-----
+%\upm at rootheadertoc and \upm at rootheadertoc@addtotoc
+\AtBeginDocument{%
+ \ifupmarticleformat%
+ \global\let\upm at rootheadertoc\@sectiontoc%
+ \gdef\upm at rootheadertoc@addtotoc#1{%
+ \addcontentsline{toc}{section}{#1}%
+ }%
+ \else%
+ \global\let\upm at rootheadertoc\@chaptertoc%
+ \gdef\upm at rootheadertoc@addtotoc#1{%
+ \addcontentsline{toc}{chapter}{#1}%
+ }%
+ \fi%
+}
+
%----------------------------------------
% BIBLIOGRAPHY
%----------------------------------------
@@ -1185,7 +1320,7 @@
%----------------------------------------
\newcounter{@@upm at fmt@inlineenumeration}
-\newcommand{\inlineenumerationlabel}[1]{(#1)}
+\newcommand{\inlineenumerationlabel}[1]{\textit{(#1)}}
\let\upm at fmt@inlineenum at numberformat\roman
\newenvironment{inlineenumeration}{%
\begingroup%
@@ -1454,29 +1589,6 @@
% HIGHLIGH BOXES
%----------------------------------------
-\newsavebox{\upm at highlight@box at save}
-
-% Parameters are:
-% #1: the width of the box
-% #2: the name of the picture
-% #3: the name of the border color
-% #4: the name of the background color
-% #5: the name of the text color
-\newenvironment{upm at highligh@box}[5]{%
- \par
- \vspace{.5cm}
- \begin{tabular}{|p{#1}|}
- \arrayrulecolor{#3}%
- \hline
- \cellcolor{#4}
- \begin{window}[0,l,{\mbox{\includegraphics[width=1cm]{#2}}},{}]
- \color{#5}
- }{%
- \normalcolor\end{window}\\ \hline \end{tabular}
- \vspace{.5cm}
- \par
-}
-
% Colors for the highligh boxes
\colorlet{highlightboxbackground_caution}{white}
\colorlet{highlightboxforeground_caution}{black}
@@ -1484,28 +1596,119 @@
\colorlet{highlightboxbackground_info}{white}
\colorlet{highlightboxforeground_info}{black}
\colorlet{highlightboxborder_info}{black}
+\colorlet{highlightboxbackground_note}{white}
+\colorlet{highlightboxforeground_note}{black}
+\colorlet{highlightboxborder_note}{black}
+\colorlet{highlightboxbackground_action}{white}
+\colorlet{highlightboxforeground_action}{black}
+\colorlet{highlightboxborder_action}{black}
\colorlet{highlightboxbackground_question}{white}
\colorlet{highlightboxforeground_question}{black}
\colorlet{highlightboxborder_question}{black}
-\newenvironment{upmcaution}[1][.8\linewidth]{%
- \bgroup\centering\upm at highligh@box{#1}{upm_caution.pdf}{highlightboxborder_caution}{highlightboxbackground_caution}{highlightboxforeground_caution}%
+% Include the skins definition with tcolorbox
+\tcbuselibrary{skins}
+
+\newtcolorbox{upm at highligh@box at caution}[1]{
+ enhanced,
+ colback=highlightboxbackground_caution,
+ colframe=highlightboxborder_caution,
+ fonttitle=\Huge\bfseries,
+ rounded corners,
+ sidebyside,
+ sidebyside align=center,
+ lefthand width=1cm, % Width for the icon area
+ colupper=highlightboxforeground_caution,
+ coltext=highlightboxforeground_caution,
+}
+
+\newenvironment{upmcaution}[1][\linewidth]{%
+ \begin{upm at highligh@box at caution}{#1}%
+ {\Huge\faExclamationTriangle}\tcblower %
}{%
- \endupm at highligh@box\egroup%
+ \end{upm at highligh@box at caution}%
}
-\newenvironment{upminfo}[1][.8\linewidth]{%
- \bgroup\centering\upm at highligh@box{#1}{upm_info.pdf}{highlightboxborder_info}{highlightboxbackground_info}{highlightboxforeground_info}%
+\newtcolorbox{upm at highligh@box at info}[1]{
+ enhanced,
+ colback=highlightboxbackground_info,
+ colframe=highlightboxborder_info,
+ fonttitle=\Huge\bfseries,
+ rounded corners,
+ sidebyside,
+ sidebyside align=center,
+ lefthand width=1cm, % Width for the icon area
+ colupper=highlightboxforeground_info,
+ coltext=highlightboxforeground_info,
+}
+
+\newenvironment{upminfo}[1][\linewidth]{%
+ \begin{upm at highligh@box at info}{#1}%
+ {\Huge\faInfoCircle}\tcblower %
}{%
- \endupm at highligh@box\egroup%
+ \end{upm at highligh@box at info}%
}
-\newenvironment{upmquestion}[1][.8\linewidth]{%
- \bgroup\centering\upm at highligh@box{#1}{upm_question.pdf}{highlightboxborder_question}{highlightboxbackground_question}{highlightboxforeground_question}%
+\newtcolorbox{upm at highligh@box at question}[1]{
+ enhanced,
+ colback=highlightboxbackground_question,
+ colframe=highlightboxborder_question,
+ fonttitle=\Huge\bfseries,
+ rounded corners,
+ sidebyside,
+ sidebyside align=center,
+ lefthand width=1cm, % Width for the icon area
+ colupper=highlightboxforeground_question,
+ coltext=highlightboxforeground_question,
+}
+
+\newenvironment{upmquestion}[1][\linewidth]{%
+ \begin{upm at highligh@box at question}{#1}%
+ {\Huge\faQuestionCircle}\tcblower %
}{%
- \endupm at highligh@box\egroup%
+ \end{upm at highligh@box at question}%
}
+\newtcolorbox{upm at highligh@box at note}[1]{
+ enhanced,
+ colback=highlightboxbackground_note,
+ colframe=highlightboxborder_note,
+ fonttitle=\Huge\bfseries,
+ rounded corners,
+ sidebyside,
+ sidebyside align=center,
+ lefthand width=1cm, % Width for the icon area
+ colupper=highlightboxforeground_note,
+ coltext=highlightboxforeground_note,
+}
+
+\newenvironment{upmnote}[1][\linewidth]{%
+ \begin{upm at highligh@box at note}{#1}%
+ {\Huge\faPen}\tcblower %
+}{%
+ \end{upm at highligh@box at note}%
+}
+
+\newtcolorbox{upm at highligh@box at action}[1]{
+ enhanced,
+ colback=highlightboxbackground_action,
+ colframe=highlightboxborder_action,
+ fonttitle=\Huge\bfseries,
+ rounded corners,
+ sidebyside,
+ sidebyside align=center,
+ lefthand width=1cm, % Width for the icon area
+ colupper=highlightboxforeground_action,
+ coltext=highlightboxforeground_action,
+}
+
+\newenvironment{upmaction}[1][\linewidth]{%
+ \begin{upm at highligh@box at action}{#1}%
+ {\Huge\faPlay}\tcblower %
+}{%
+ \end{upm at highligh@box at action}%
+}
+
%----------------------------------------
% PROVIDE URL MACROS, WHICH WILL BE
% OVERRIDDEN BY THE DOCUMENT CLASS
@@ -1535,83 +1738,93 @@
% ENVIRONMENT FOR DEFINITIONS
%----------------------------------------
+% Include the theorem definition with tcolorbox
+\tcbuselibrary{theorems}
+
%-----
% Defining the style for the definitions
-\colorlet{definitionbackground}{backtableheader}
-\colorlet{definitionheaderforeground}{fronttableheader}
-\colorlet{definitionborder}{fronttableheader}
-\colorlet{definitiontextforeground}{fronttableheader}
+\colorlet{definitionbackground}{tableheaderbackground!10}
+\colorlet{definitionheaderforeground}{tableheaderforeground}
+\colorlet{definitionborder}{tableheaderbackground}
+\colorlet{definitiontextforeground}{tableheaderforeground}
+\colorlet{definitionsourceforeground}{gray}
\ifupmlang{french}{
\gdef\definitionname{D\'efinition}
\gdef\listdefinitionname{Liste des d\'efinitions}
+ \gdef\upm at definition@formatsource#1{\definitionsourcename\;:\xspace#1}
}{
\gdef\definitionname{Definition}
\gdef\listdefinitionname{List of Definitions}
+ \gdef\upm at definition@formatsource#1{\definitionsourcename:\xspace#1}
}
+\global\let\definitionsourcename\upm at format@lang at sourcename
-\gdef\upm at definition@width{.9\linewidth}
-\gdef\upm at definition@rule at width{\linewidth}
-\gdef\upm at definition@rule at height{0.4pt}
+\gdef\upm at definition@width{\linewidth}
-\newtheoremstyle{upmdefinition}% name of the style to be used
- {}% measure of space to leave above the theorem. E.g.: 3pt
- {}% measure of space to leave below the theorem. E.g.: 3pt
- {\normalfont}% name of font to use in the body of the theorem
- {}% measure of space to indent the head
- {\normalfont\bfseries}% name of head font
- {\\[-1em]{\textcolor{definitionborder}{\rule{\upm at definition@rule at width}{\upm at definition@rule at height}}}}% punctuation between head and body
- {\newline}% space after theorem head
- {\textcolor{definitionheaderforeground}{\thmname{#1}\thmnumber{~#2}\upm at column@char\thmnote{ #3}}\vspace{.25em}}% Manually specify head
+\tcbset{
+ upmdefinition/.style={
+ attach title,
+ titlebox=visible,
+ colback=definitionbackground,
+ colframe=definitionborder,
+ coltitle=definitionheaderforeground,
+ coltext=definitiontextforeground,
+ collower=definitionsourceforeground,
+ fonttitle=\bfseries,
+ fontlower=\normalfont\smaller\itshape,
+ lower separated=false,
+ rounded corners,
+ before upper=\tcbtitle,
+ halign=justify,
+ halign title=left,
+ width=\upm at definition@width,
+ leftrule=1mm,
+ }
+}
+\newcommand{\upm at definition@argumentmanager}[4][]{%
+ \gdef\upm at definition@arga{#1}%
+ \gdef\upm at definition@argb{#3}%
+ \gdef\upm at definition@argc{#4}%
+ \gdef\upm at definition@startenv{\begin{upm@#2}}%
+ \@ifnextchar[{\upm at definition@argumentmanager at a}{\upm at definition@argumentmanager at b}%
+}
+\gdef\upm at definition@argumentmanager at a[#1]{%
+ \gdef\upm at definition@source{#1}%
+ \expandafter\upm at definition@startenv[lowerbox=visible,\upm at definition@arga]{\upm at definition@argb}{\upm at definition@argc}%
+}
+\gdef\upm at definition@argumentmanager at b{%
+ \global\let\upm at definition@source\@empty%
+ \expandafter\upm at definition@startenv[lowerbox=ignored,\upm at definition@arga]{\upm at definition@argb}{\upm at definition@argc}%
+}
+
%-----
% Declare a theorem with the standard UPM style
-% \declareupmtheorem[theorem_style]{name}{label}{list_label}
-\newcommand{\declareupmtheorem}[4][upmdefinition]{%
- \global\declaretheorem[name={#3},style=#1]{upm#2}%
- \global\newenvironment{#2}[1][]{%
- \par\vspace{\parsep}\centering\begin{framedcolorminipage}{\upm at definition@width}{definitionborder}{definitionbackground}%
- \color{definitiontextforeground}%
- \begin{upm#2}[##1]%
+% \declareupmtheorem[theorem_style]{environment_name}{label}{list_label}{label_prefix}{list_name}{source_format_macro}
+\newcommand{\declareupmtheorem}[7][upmdefinition]{%
+ \expandafter\newtcbtheorem[list inside=#6]{upm@#2}{#3}{upmdefinition}{#5}%
+ \newenvironment{#2}[3][]{%
+ \upm at definition@argumentmanager[##1]{#2}{\nohyphens{##2}}{##3}%
}{%
- \end{upm#2}%
- \end{framedcolorminipage}\vspace{\parsep}\par%
- }%
+ \Ifnotempty{\upm at definition@source}{\tcblower#7{\upm at definition@source}}%
+ \end{upm@#2}%
+ }
% Check the version of the thmtools because the TeXLive distribution
% gives a too old version.
- \@ifpackagelater{thm-listof}{2012/05/03}{%
- \global\@namedef{listof#2s}{%
- \global\let\upm at definition@old at listtheoremname\listtheoremname%
- \global\let\upm at definition@old at upmtheoremopt\upm at definition@upmtheoremopt%
- \gdef\listtheoremname{#4}%
- \renewcommand{\upm at definition@upmtheoremopt}[1]{}%
- \expandafter\listoftheorems[ignoreall,show={upm#2}]%
- \global\let\listtheoremname\upm at definition@old at listtheoremname%
- \global\let\upm at definition@upmtheoremopt\upm at definition@old at upmtheoremopt%
- }%
- }{%
- \@latex at warning{Your version of the thmtools is too old. I recommend you to install the version 2012/05/04, or later.}
- \global\@namedef{listof#2s}{%
- \global\let\upm at tmp\listtheoremname%
- \gdef\listtheoremname{#4}%
- \listoftheorems%
- \global\let\listtheoremname\upm at tmp%
- }%
- }
+ \global\@namedef{listof#2s}{\tcblistof[\upm at rootheadertoc]{#2}{#4}}%
}
\@onlypreamble\declareupmtheorem
-\gdef\thmtformatoptarg#1{\upm at column@char\ #1}%
-
-% Permits to define a part of the definition's name that is
-% rendered only in core part of the document, not in the
-% list of theorems
-\gdef\upm at definition@upmtheoremopt#1{#1}
-\gdef\upmtheoremopt#1{\protect\upm at definition@upmtheoremopt{#1}}
-
%-----
-% Declare the definition environment
-\declareupmtheorem{definition}{\definitionname}{\listdefinitionname}
+% Declare the definition environments
+\declareupmtheorem{definition}{\definitionname}{\listdefinitionname}{def}{definition}{\upm at definition@formatsource}
+%-----
+%\defref{label}
+\newcommand{\defref}[1]{\ref{def:#1}}
+%-----
+%\defpageref{label}
+\newcommand{\defpageref}[1]{\pageref{def:#1}}
%----------------------------------------
% ENVIRONMENT FOR EMPHBOX
@@ -1619,9 +1832,9 @@
%-----
% Defining the style for the emphbox
-\colorlet{emphboxbackground}{backtableheader}
-\colorlet{emphboxborder}{fronttableheader}
-\colorlet{emphboxtext}{fronttableheader}
+\colorlet{emphboxbackground}{tableheaderbackground}
+\colorlet{emphboxborder}{tableheaderforeground}
+\colorlet{emphboxtext}{tableheaderforeground}
\colorlet{emphboxbackgroundb}{yellow!7}
\colorlet{emphboxbackgroundc}{green!10}
@@ -1629,9 +1842,9 @@
% Draw an emph box without title
% [#1]: width of the box (linewidth by default)
\NewEnviron{emphbox}[1][\linewidth]{%
- \begin{framedcolorminipage}{#1}{emphboxborder}{emphboxbackground}%
- \centering\color{emphboxtext}\BODY%
- \end{framedcolorminipage}%
+ \begin{tcolorbox}[halign=center,valign=center,coltext=emphboxtext,colback=emphboxbackground,colframe=emphboxborder,rounded corners]
+ \BODY%
+ \end{tcolorbox}%
}
%-----
@@ -1639,11 +1852,9 @@
% [#1]: width of the box (linewidth by default)
% #2: text of the title
\NewEnviron{titleemphbox}[2][\linewidth]{%
- \begin{framedcolorminipage}{#1}{emphboxborder}{emphboxbackground}%
- \centering\color{emphboxtext}%
- \vspace{.25cm}\uline{\textbf{#2}}\\[.25cm]%
- \raggedright\BODY\vspace{.25cm}%
- \end{framedcolorminipage}\\[.4cm]%
+ \begin{tcolorbox}[halign=center,valign=center,coltext=emphboxtext,colback=emphboxbackground,colframe=emphboxborder,rounded corners,fonttitle=\bfseries,halign title=center,title=#2]
+ \BODY%
+ \end{tcolorbox}%
}
%-----
@@ -1651,11 +1862,9 @@
% [#1]: width of the box (linewidth by default)
% #2: text of the title
\NewEnviron{titleemphbox2}[2][\linewidth]{%
- \begin{framedcolorminipage}{#1}{emphboxborder}{emphboxbackgroundb}%
- \centering\color{emphboxtext}%
- \vspace{.25cm}\uline{\textbf{#2}}\\[.25cm]%
- \raggedright\BODY\vspace{.25cm}%
- \end{framedcolorminipage}\\[.4cm]%
+ \begin{tcolorbox}[halign=center,valign=center,coltext=emphboxtext,colback=emphboxbackgroundb,colframe=emphboxborder,rounded corners,fonttitle=\bfseries,halign title=center,title=#2]
+ \BODY%
+ \end{tcolorbox}%
}
%-----
@@ -1663,12 +1872,41 @@
% [#1]: width of the box (linewidth by default)
% #2: text of the title
\NewEnviron{titleemphbox3}[2][\linewidth]{%
- \begin{framedcolorminipage}{#1}{emphboxborder}{emphboxbackgroundc}%
- \centering\color{emphboxtext}%
- \vspace{.25cm}\uline{\textbf{#2}}\\[.25cm]%
- \raggedright\BODY\vspace{.25cm}%
- \end{framedcolorminipage}\\[.4cm]%
+ \begin{tcolorbox}[halign=center,valign=center,coltext=emphboxtext,colback=emphboxbackgroundc,colframe=emphboxborder,rounded corners,fonttitle=\bfseries,halign title=center,title=#2]
+ \BODY%
+ \end{tcolorbox}%
}
+%----------------------------------------
+% FIXING THE CHAPTER/SECTION NAMES
+%----------------------------------------
+
+% Change the names of the section "List of *" when the language
+% is French, because the LaTeX packages do not define them properly
+\AtBeginDocument{%
+ \@ifundefined{listfigurename}{}{%
+ \global\let\listfigurename\upm at format@lang at listoffigures%
+ }%
+ \@ifundefined{listalgorithmname}{}{%
+ \global\let\listalgorithmname\upm at format@lang at listofalgorithms%
+ }
+}
+
+%----------------------------------------
+% REDEFINE THE LISTOFALGORTIHMS MACRO FOR BEING IN TOC
+%----------------------------------------
+
+% Force the list of algorithms to be in the TOC.
+\AtBeginDocument{%
+ \@ifundefined{listofalgorithms}{}{%
+ \renewcommand{\listofalgorithms}{%
+ \global\let\upm at float@listhead at old\float at listhead%
+ \global\let\float at listhead\upm at rootheadertoc%
+ \listof{algorithm}{\listalgorithmname}%
+ \global\let\float at listhead\upm at float@listhead at old%
+ }%
+ }%
+}
+
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-frontpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-frontpage.sty 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-frontpage.sty 2025-03-16 19:57:13 UTC (rev 74650)
@@ -18,7 +18,7 @@
% 330, Boston, MA 02111-1307, USA.
%
-\global\edef\upm at package@fp at ver{2025/03/11}
+\global\edef\upm at package@fp at ver{2025/03/15}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-frontpage}[\upm at package@fp at ver]
Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty 2025-03-16 19:57:13 UTC (rev 74650)
@@ -16,7 +16,7 @@
% 330, Boston, MA 02111-1307, USA.
%
-\global\edef\upm at package@private at doctype@ver{2025/03/11}
+\global\edef\upm at package@private at doctype@ver{2025/03/15}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-p-common}[\upm at package@private at doctype@ver]
@@ -229,3 +229,4 @@
}
\endinput
+
Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-spec.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-spec.sty 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-spec.sty 2025-03-16 19:57:13 UTC (rev 74650)
@@ -23,7 +23,7 @@
% 2007-03-19 Add localization.
%
-\global\edef\upm at package@spec at ver{2025/03/11}
+\global\edef\upm at package@spec at ver{2025/03/15}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-spec}[\upm at package@spec at ver]
Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-task.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-task.sty 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-task.sty 2025-03-16 19:57:13 UTC (rev 74650)
@@ -23,7 +23,7 @@
% 2007-03-19 Add localization.
%
-\global\edef\upm at package@task at ver{2025/03/11}
+\global\edef\upm at package@task at ver{2025/03/15}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-task}[\upm at package@task at ver]
@@ -234,8 +234,7 @@
\begin{description}\upm at task@tmp at e\end{description}%
}} \\}%
}%
- \vspace{.25cm}\noindent\begin{mtabular}[#1]{3}{|X|X|X|}
- \tabulartitle{{\upm at task@lang at task}~\textit{#2}: \thetaskname{#2}}
+ \vspace{.25cm}\noindent\begin{mtabular}[#1]{3}{|X|X|X|}{{\upm at task@lang at task}~\textit{#2}: \thetaskname{#2}}
\hline
%description
\upm at task@lang at description: & \multicolumn{2}{X|}{\parbox[t]{1.9\linewidth}{\thetaskcomment{#2}}} \\
Modified: trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty 2025-03-16 19:56:59 UTC (rev 74649)
+++ trunk/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty 2025-03-16 19:57:13 UTC (rev 74650)
@@ -19,7 +19,7 @@
% 330, Boston, MA 02111-1307, USA.
%
-\global\edef\upm at package@version at ver{2025/03/11}
+\global\edef\upm at package@version at ver{2025/03/15}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-version}[\upm at package@version at ver]
@@ -171,8 +171,7 @@
% Display the version history
%\upmhistory[width]
\newcommand{\upmhistory}[1][\linewidth]{%
- \noindent\expandafter\begin{mtabular}[#1]{3}{|c|c|X|}
- \tabulartitle{\upm at lang@version at history}%
+ \noindent\expandafter\begin{mtabular}[#1]{3}{|c|c|X|}{\upm at lang@version at history}%
\tabularheader{\upm at lang@version}{\upm at lang@date}{\upm at lang@updates}%
\upm at update@list
\hline
More information about the tex-live-commits
mailing list.