upmethodology (28sep19)

git-svn-id: svn://tug.org/texlive/trunk@52200 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 235 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/latex/upmethodology/upm_caution.pdf b/Master/texmf-dist/doc/latex/upmethodology/upm_caution.pdf
new file mode 100644
index 00000000000..eb0fa4957a7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/upmethodology/upm_caution.pdf
diff --git a/Master/texmf-dist/doc/latex/upmethodology/upm_caution.png b/Master/texmf-dist/doc/latex/upmethodology/upm_caution.png
index 892e28aad57..51c62e371fc 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/upm_caution.png
+++ b/Master/texmf-dist/doc/latex/upmethodology/upm_caution.png
diff --git a/Master/texmf-dist/doc/latex/upmethodology/upm_caution.svg b/Master/texmf-dist/doc/latex/upmethodology/upm_caution.svg
new file mode 100644
index 00000000000..2e0e833f9ce
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/upmethodology/upm_caution.svg
@@ -0,0 +1,66 @@
+<?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>
diff --git a/Master/texmf-dist/doc/latex/upmethodology/upm_info.pdf b/Master/texmf-dist/doc/latex/upmethodology/upm_info.pdf
new file mode 100644
index 00000000000..09ff0ef1b45
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/upmethodology/upm_info.pdf
diff --git a/Master/texmf-dist/doc/latex/upmethodology/upm_info.png b/Master/texmf-dist/doc/latex/upmethodology/upm_info.png
index ea470f49afa..ede9860e955 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/upm_info.png
+++ b/Master/texmf-dist/doc/latex/upmethodology/upm_info.png
diff --git a/Master/texmf-dist/doc/latex/upmethodology/upm_info.svg b/Master/texmf-dist/doc/latex/upmethodology/upm_info.svg
new file mode 100644
index 00000000000..a247c9d6858
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/upmethodology/upm_info.svg
@@ -0,0 +1,66 @@
+<?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 -22.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>
diff --git a/Master/texmf-dist/doc/latex/upmethodology/upm_question.pdf b/Master/texmf-dist/doc/latex/upmethodology/upm_question.pdf
new file mode 100644
index 00000000000..d77f42de754
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/upmethodology/upm_question.pdf
diff --git a/Master/texmf-dist/doc/latex/upmethodology/upm_question.png b/Master/texmf-dist/doc/latex/upmethodology/upm_question.png
index a959004aa73..a69a07dee75 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/upm_question.png
+++ b/Master/texmf-dist/doc/latex/upmethodology/upm_question.png
diff --git a/Master/texmf-dist/doc/latex/upmethodology/upm_question.svg b/Master/texmf-dist/doc/latex/upmethodology/upm_question.svg
new file mode 100644
index 00000000000..88911f8f376
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/upmethodology/upm_question.svg
@@ -0,0 +1,66 @@
+<?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.146536 -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>
diff --git a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
index fbd7b4b22f6..267de193195 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
+++ b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
@@ -1 +1 @@
-\def\UPMVERSION{20190917}
+\def\UPMVERSION{20190928}
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
index bbdd4bce1e6..776022789d5 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
@@ -1,6 +1,6 @@
 % Layout and Pagraph Format for Unified Process Methodology
 %
-% Copyright (c) 2006-2009, 2012-2015 Stephane GALLAND <galland@arakhne.org>
+% Copyright (c) 2006-2009, 2012-2019 Stephane GALLAND <galland@arakhne.org>
 % 
 % This program is free library; you can redistribute it and/or modify
 % it under the terms of the GNU Lesser General Public License as
@@ -17,7 +17,7 @@
 % write to the Free Software Foundation, Inc., 59 Temple Place - Suite
 % 330, Boston, MA 02111-1307, USA.
 
-\global\edef\upm@package@fmt@ver{2019/08/04}
+\global\edef\upm@package@fmt@ver{2019/09/28}
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver]
@@ -1370,34 +1370,54 @@
 
 \newsavebox{\upm@highlight@box@save}
 
-\newenvironment{upm@highligh@box}[2]{%
+% 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@highligh@box}[5]{%
 	\par
 	\vspace{.5cm}
 	\begin{tabular}{|p{#1}|}
-	\hline
-	\begin{window}[0,l,{\mbox{\includegraphics[width=1cm]{#2}}},{}]
-}{%
-	\end{window}\\ \hline \end{tabular}
+		\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
 }
 
-\newenvironment{upmcaution}[1][\linewidth]{%
-	\upm@highligh@box{#1}{upm_caution.png}%
+% Colors for the highligh boxes
+\colorlet{highlightboxbackground_caution}{white}
+\colorlet{highlightboxforeground_caution}{black}
+\colorlet{highlightboxborder_caution}{black}
+\colorlet{highlightboxbackground_info}{white}
+\colorlet{highlightboxforeground_info}{black}
+\colorlet{highlightboxborder_info}{black}
+\colorlet{highlightboxbackground_question}{white}
+\colorlet{highlightboxforeground_question}{black}
+\colorlet{highlightboxborder_question}{black}
+
+\newenvironment{upmcaution}[1][.8\linewidth]{%
+	\bgroup\centering\upm@highligh@box{#1}{upm_caution.pdf}{highlightboxborder_caution}{highlightboxbackground_caution}{highlightboxforeground_caution}%
 }{%
-	\endupm@highligh@box%
+	\endupm@highligh@box\egroup%
 }
 
-\newenvironment{upminfo}[1][\linewidth]{%
-	\upm@highligh@box{#1}{upm_info.png}%
+\newenvironment{upminfo}[1][.8\linewidth]{%
+	\bgroup\centering\upm@highligh@box{#1}{upm_info.pdf}{highlightboxborder_info}{highlightboxbackground_info}{highlightboxforeground_info}%
 }{%
-	\endupm@highligh@box%
+	\endupm@highligh@box\egroup%
 }
 
-\newenvironment{upmquestion}[1][\linewidth]{%
-	\upm@highligh@box{#1}{upm_question.png}%
+\newenvironment{upmquestion}[1][.8\linewidth]{%
+	\bgroup\centering\upm@highligh@box{#1}{upm_question.pdf}{highlightboxborder_question}{highlightboxbackground_question}{highlightboxforeground_question}%
 }{%
-	\endupm@highligh@box%
+	\endupm@highligh@box\egroup%
 }
 
 %----------------------------------------