From 7a53eb5f60bd8eb01adc4a1a248023caba07a53e Mon Sep 17 00:00:00 2001 From: Ludovic Apvrille <ludovic.apvrille@telecom-paris.fr> Date: Wed, 30 Jun 2021 17:54:22 +0200 Subject: [PATCH] Update on internalhelp css --- Makefile | 2 +- modeling/AVATAR/CoffeeMachine_Avatar.xml | 534 +++++++++++----------- src/main/resources/help/requirements.html | 131 +----- 3 files changed, 269 insertions(+), 398 deletions(-) diff --git a/Makefile b/Makefile index 40326e8efd..15c3e2b6b9 100755 --- a/Makefile +++ b/Makefile @@ -213,7 +213,7 @@ html: $(MD2HTML) @chmod u+x $(TTOOL_SIMULATORS)/c++2/src_simulator/helpGeneration.sh @$(TTOOL_SIMULATORS)/c++2/src_simulator/helpGeneration.sh $(TTOOL_SIMULATORS)/c++2/src_simulator/ServerHelpData.h $(TTOOL_HELP_DIR)/diplodocussimulator.html %.html: %.md - pandoc $< -f markdown -t html -s -o $@ --lua-filter=doc/ttoolfilter.lua --metadata pagetitle="TTool help" + pandoc $< -f markdown -t html -s -o $@ --lua-filter=doc/ttoolfilter.lua --metadata pagetitle="TTool help" --css $(TTOOL_RESOURCES)/help/help.css # ======================================== # ========== DOCUMENTATION ========== diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml index 40d4b1f679..096e4f3238 100644 --- a/modeling/AVATAR/CoffeeMachine_Avatar.xml +++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml @@ -810,7 +810,7 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from TGComponent to TGComponent" value="" /> <TGConnectingPoint num="0" id="468" /> -<P1 x="302" y="261" id="512" /> +<P1 x="302" y="261" id="499" /> <P2 x="361" y="261" id="487" /> <AutomaticDrawing data="true" /> </CONNECTOR> @@ -828,7 +828,7 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from TGComponent to TGComponent" value="" /> <TGConnectingPoint num="0" id="472" /> -<P1 x="305" y="211" id="499" /> +<P1 x="305" y="211" id="512" /> <P2 x="361" y="211" id="486" /> <AutomaticDrawing data="true" /> </CONNECTOR> @@ -915,13 +915,13 @@ <TGConnectingPoint num="22" id="545" /> <TGConnectingPoint num="23" id="546" /> </COMPONENT> -<SUBCOMPONENT type="5304" id="509" index="13" uid="2dbef5cf-57eb-4674-94d5-4b37c6777b4a" > +<SUBCOMPONENT type="5304" id="509" index="13" uid="e14fd5a7-c9ae-42ab-b99a-306f91c69127" > <father id="547" num="0" /> -<cdparam x="166" y="191" /> -<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="154" y="241" /> +<sizeparam width="148" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="29" minY="0" maxY="114" /> -<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" /> +<cdrectangleparam minX="0" maxX="20" minY="0" maxY="114" /> +<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" /> <TGConnectingPoint num="0" id="497" /> <TGConnectingPoint num="1" id="498" /> <TGConnectingPoint num="2" id="499" /> @@ -935,13 +935,13 @@ <TGConnectingPoint num="10" id="507" /> <TGConnectingPoint num="11" id="508" /> </SUBCOMPONENT> -<SUBCOMPONENT type="5304" id="522" index="14" uid="e14fd5a7-c9ae-42ab-b99a-306f91c69127" > +<SUBCOMPONENT type="5304" id="522" index="14" uid="2dbef5cf-57eb-4674-94d5-4b37c6777b4a" > <father id="547" num="1" /> -<cdparam x="154" y="241" /> -<sizeparam width="148" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="166" y="191" /> +<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="20" minY="0" maxY="114" /> -<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" /> +<cdrectangleparam minX="0" maxX="29" minY="0" maxY="114" /> +<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" /> <TGConnectingPoint num="0" id="510" /> <TGConnectingPoint num="1" id="511" /> <TGConnectingPoint num="2" id="512" /> @@ -1071,7 +1071,7 @@ <TGConnectingPoint num="0" id="606" /> <TGConnectingPoint num="1" id="607" /> <TGConnectingPoint num="2" id="608" /> -<P1 x="581" y="154" id="682" /> +<P1 x="581" y="154" id="695" /> <P2 x="546" y="305" id="752" /> <Point x="518" y="154" /> <Point x="518" y="305" /> @@ -1099,7 +1099,7 @@ <infoparam name="connector from TGComponent to TGComponent" value="" /> <TGConnectingPoint num="0" id="611" /> <TGConnectingPoint num="1" id="612" /> -<P1 x="631" y="164" id="677" /> +<P1 x="631" y="164" id="690" /> <P2 x="667" y="310" id="739" /> <Point x="631" y="310" /> <AutomaticDrawing data="true" /> @@ -1127,7 +1127,7 @@ <infoparam name="connector from TGComponent to TGComponent" value="" /> <TGConnectingPoint num="0" id="617" /> <TGConnectingPoint num="1" id="618" /> -<P1 x="721" y="158" id="688" /> +<P1 x="721" y="158" id="675" /> <P2 x="700" y="204" id="729" /> <Point x="700" y="158" /> <AutomaticDrawing data="true" /> @@ -1282,13 +1282,13 @@ <TGConnectingPoint num="22" id="722" /> <TGConnectingPoint num="23" id="723" /> </COMPONENT> -<SUBCOMPONENT type="5304" id="686" index="24" uid="5ba2c908-950a-4288-889b-0b4c00bd9d79" > +<SUBCOMPONENT type="5303" id="686" index="24" uid="bf44a33b-5344-46b2-9170-509d38670a83" > <father id="724" num="0" /> -<cdparam x="581" y="125" /> -<sizeparam width="100" height="39" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="721" y="133" /> +<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" /> -<infoparam name="TGComponent" value="Start" /> +<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" /> +<infoparam name="TGComponent" value="nbOfCoins" /> <TGConnectingPoint num="0" id="674" /> <TGConnectingPoint num="1" id="675" /> <TGConnectingPoint num="2" id="676" /> @@ -1301,14 +1301,17 @@ <TGConnectingPoint num="9" id="683" /> <TGConnectingPoint num="10" id="684" /> <TGConnectingPoint num="11" id="685" /> +<extraparam> +<Toggle value="" /> +</extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="5303" id="699" index="25" uid="bf44a33b-5344-46b2-9170-509d38670a83" > +<SUBCOMPONENT type="5304" id="699" index="25" uid="5ba2c908-950a-4288-889b-0b4c00bd9d79" > <father id="724" num="1" /> -<cdparam x="721" y="133" /> -<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="581" y="125" /> +<sizeparam width="100" height="39" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" /> -<infoparam name="TGComponent" value="nbOfCoins" /> +<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" /> +<infoparam name="TGComponent" value="Start" /> <TGConnectingPoint num="0" id="687" /> <TGConnectingPoint num="1" id="688" /> <TGConnectingPoint num="2" id="689" /> @@ -1321,9 +1324,6 @@ <TGConnectingPoint num="9" id="696" /> <TGConnectingPoint num="10" id="697" /> <TGConnectingPoint num="11" id="698" /> -<extraparam> -<Toggle value="" /> -</extraparam> </SUBCOMPONENT> <COMPONENT type="5306" id="736" index="14" uid="7a1c9320-1617-4710-a22f-ae8365f354ef" > @@ -1454,7 +1454,7 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="800" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from Block1 to Block0" value="" /> <TGConnectingPoint num="0" id="789" /> -<P1 x="446" y="279" id="868" /> +<P1 x="446" y="279" id="843" /> <P2 x="447" y="301" id="901" /> <AutomaticDrawing data="true" /> <extraparam> @@ -1484,7 +1484,7 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="800" maxHeight="1600" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from Block1 to Block0" value="" /> <TGConnectingPoint num="0" id="793" /> -<P1 x="631" y="278" id="843" /> +<P1 x="631" y="278" id="868" /> <P2 x="631" y="301" id="902" /> <AutomaticDrawing data="true" /> <extraparam> @@ -1643,13 +1643,13 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <Signal value="out ejectCoin(int nbOfCoins)" attached="true" /> </extraparam> </COMPONENT> -<SUBCOMPONENT type="5000" id="861" index="6" uid="a5114e80-03e3-4820-b57a-bfcefd90a9c8" > +<SUBCOMPONENT type="5000" id="861" index="6" uid="7a21d6ab-e515-4a9c-b908-bcb26c800cfb" > <father id="911" num="0" /> -<cdparam x="556" y="197" /> -<sizeparam width="150" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="371" y="198" /> +<sizeparam width="151" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="218" minY="0" maxY="205" /> -<infoparam name="Block1" value="TeaButton" /> +<cdrectangleparam minX="0" maxX="217" minY="0" maxY="205" /> +<infoparam name="Block1" value="CoffeeButton" /> <TGConnectingPoint num="0" id="837" /> <TGConnectingPoint num="1" id="838" /> <TGConnectingPoint num="2" id="839" /> @@ -1681,13 +1681,13 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <Signal value="out push()" attached="true" /> </extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="5000" id="886" index="7" uid="7a21d6ab-e515-4a9c-b908-bcb26c800cfb" > +<SUBCOMPONENT type="5000" id="886" index="7" uid="a5114e80-03e3-4820-b57a-bfcefd90a9c8" > <father id="911" num="1" /> -<cdparam x="371" y="198" /> -<sizeparam width="151" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="556" y="197" /> +<sizeparam width="150" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="217" minY="0" maxY="205" /> -<infoparam name="Block1" value="CoffeeButton" /> +<cdrectangleparam minX="0" maxX="218" minY="0" maxY="205" /> +<infoparam name="Block1" value="TeaButton" /> <TGConnectingPoint num="0" id="862" /> <TGConnectingPoint num="1" id="863" /> <TGConnectingPoint num="2" id="864" /> @@ -1729,8 +1729,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from start state to Send signal" value="null" /> <TGConnectingPoint num="0" id="917" /> -<P1 x="340" y="233" id="1088" /> -<P2 x="353" y="252" id="1090" /> +<P1 x="340" y="233" id="1099" /> +<P2 x="353" y="252" id="1088" /> <AutomaticDrawing data="true" /> </CONNECTOR><SUBCOMPONENT type="-1" id="916" index="8" uid="4b47f2ec-3073-4a06-b6e0-da7704454345" > <father id="918" num="0" /> @@ -1828,7 +1828,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from Send signal to state0" value="null" /> <TGConnectingPoint num="0" id="938" /> -<P1 x="353" y="282" id="1091" /> +<P1 x="353" y="282" id="1089" /> <P2 x="399" y="352" id="941" /> <AutomaticDrawing data="true" /> </CONNECTOR><SUBCOMPONENT type="-1" id="937" index="11" uid="ef1e1204-6711-4c2c-b81f-515c0e412fcb" > @@ -2113,33 +2113,33 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <extraparam> </extraparam> </COMPONENT> -<SUBCOMPONENT type="5100" id="1089" index="12" uid="4ea28494-de50-4f99-8981-3ef7a87d7d34" > +<SUBCOMPONENT type="5103" id="1098" index="12" uid="71f14636-3c96-4e4e-8d0e-c1cd11e52641" > <father id="1173" num="0" /> -<cdparam x="333" y="213" /> -<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" /> -<infoparam name="start state" value="null" /> -<TGConnectingPoint num="0" id="1088" /> -</SUBCOMPONENT> -<SUBCOMPONENT type="5103" id="1100" index="13" uid="71f14636-3c96-4e4e-8d0e-c1cd11e52641" > -<father id="1173" num="1" /> <cdparam x="330" y="257" /> <sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> <cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" /> <infoparam name="Send signal" value="push()" /> -<TGConnectingPoint num="0" id="1090" /> -<TGConnectingPoint num="1" id="1091" /> -<TGConnectingPoint num="2" id="1092" /> -<TGConnectingPoint num="3" id="1093" /> -<TGConnectingPoint num="4" id="1094" /> -<TGConnectingPoint num="5" id="1095" /> -<TGConnectingPoint num="6" id="1096" /> -<TGConnectingPoint num="7" id="1097" /> -<TGConnectingPoint num="8" id="1098" /> -<TGConnectingPoint num="9" id="1099" /> +<TGConnectingPoint num="0" id="1088" /> +<TGConnectingPoint num="1" id="1089" /> +<TGConnectingPoint num="2" id="1090" /> +<TGConnectingPoint num="3" id="1091" /> +<TGConnectingPoint num="4" id="1092" /> +<TGConnectingPoint num="5" id="1093" /> +<TGConnectingPoint num="6" id="1094" /> +<TGConnectingPoint num="7" id="1095" /> +<TGConnectingPoint num="8" id="1096" /> +<TGConnectingPoint num="9" id="1097" /> +</SUBCOMPONENT> +<SUBCOMPONENT type="5100" id="1100" index="13" uid="4ea28494-de50-4f99-8981-3ef7a87d7d34" > +<father id="1173" num="1" /> +<cdparam x="333" y="213" /> +<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" /> +<infoparam name="start state" value="null" /> +<TGConnectingPoint num="0" id="1099" /> </SUBCOMPONENT> @@ -2716,8 +2716,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from start state to state0" value="null" /> <TGConnectingPoint num="0" id="1415" /> -<P1 x="261" y="421" id="2061" /> -<P2 x="260" y="437" id="2064" /> +<P1 x="261" y="421" id="2050" /> +<P2 x="260" y="437" id="1978" /> <AutomaticDrawing data="true" /> </CONNECTOR><SUBCOMPONENT type="-1" id="1414" index="38" uid="a28ea541-81ef-4713-8ea6-c7f5ba166daa" > <father id="1416" num="0" /> @@ -2749,8 +2749,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from state0 to Send signal" value="null" /> <TGConnectingPoint num="0" id="1422" /> -<P1 x="227" y="477" id="2077" /> -<P2 x="126" y="524" id="2050" /> +<P1 x="227" y="477" id="1991" /> +<P2 x="126" y="524" id="2052" /> <AutomaticDrawing data="true" /> </CONNECTOR><SUBCOMPONENT type="-1" id="1421" index="39" uid="2484893a-3443-40dc-8f74-e1443edc2bde" > <father id="1423" num="0" /> @@ -2782,8 +2782,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from Send signal to stop state" value="null" /> <TGConnectingPoint num="0" id="1429" /> -<P1 x="126" y="554" id="2051" /> -<P2 x="126" y="653" id="1967" /> +<P1 x="126" y="554" id="2053" /> +<P2 x="126" y="653" id="2075" /> <AutomaticDrawing data="true" /> </CONNECTOR><SUBCOMPONENT type="-1" id="1428" index="40" uid="6f6c6e3e-0702-4e99-b1e6-da999207526e" > <father id="1430" num="0" /> @@ -2817,8 +2817,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from state0 to Send signal" value="null" /> <TGConnectingPoint num="0" id="1436" /> -<P1 x="293" y="477" id="2078" /> -<P2 x="298" y="524" id="2136" /> +<P1 x="293" y="477" id="1992" /> +<P2 x="298" y="524" id="1966" /> <AutomaticDrawing data="true" /> </CONNECTOR><SUBCOMPONENT type="-1" id="1435" index="41" uid="18f77c23-d770-43b2-a9ca-161802d8a987" > <father id="1437" num="0" /> @@ -2850,7 +2850,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from Send signal to stop state" value="null" /> <TGConnectingPoint num="0" id="1443" /> -<P1 x="298" y="554" id="2137" /> +<P1 x="298" y="554" id="1967" /> <P2 x="296" y="650" id="1894" /> <AutomaticDrawing data="true" /> </CONNECTOR><SUBCOMPONENT type="-1" id="1442" index="42" uid="a2a44349-5c04-4880-b1fb-76fa61d0f788" > @@ -2885,8 +2885,8 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector from state0 to Send signal" value="null" /> <TGConnectingPoint num="0" id="1450" /> -<P1 x="326" y="457" id="2067" /> -<P2 x="442" y="497" id="2039" /> +<P1 x="326" y="457" id="1981" /> +<P2 x="442" y="497" id="2063" /> <AutomaticDrawing data="true" /> </CONNECTOR><SUBCOMPONENT type="-1" id="1449" index="43" uid="1286b08f-20a2-44ff-9ae2-d3d09cf02647" > <father id="1451" num="0" /> @@ -2919,7 +2919,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <infoparam name="connector from Send signal to stop state" value="null" /> <TGConnectingPoint num="0" id="1458" /> <TGConnectingPoint num="1" id="1459" /> -<P1 x="442" y="527" id="2040" /> +<P1 x="442" y="527" id="2064" /> <P2 x="323" y="748" id="1756" /> <Point x="442" y="737" /> <AutomaticDrawing data="true" /> @@ -3003,7 +3003,7 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="null" /> <TGConnectingPoint num="0" id="1474" /> -<P1 x="126" y="702" id="1972" /> +<P1 x="126" y="702" id="2080" /> <P2 x="221" y="758" id="1757" /> <AutomaticDrawing data="true" /> </CONNECTOR><SUBCOMPONENT type="-1" id="1473" index="47" uid="96753e12-f1ba-45d7-9fc5-e71fe53eb22b" > @@ -3707,14 +3707,14 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <extraparam> </extraparam> </COMPONENT> -<SUBCOMPONENT type="5106" id="2038" index="48" uid="52044bb2-8b01-4108-a1ac-b5e7886ea624" > +<SUBCOMPONENT type="5104" id="1976" index="48" uid="8718a1dd-4942-43e5-b6ce-b5f78b82a355" > <father id="2219" num="0" /> -<cdparam x="53" y="653" /> -<sizeparam width="146" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="242" y="529" /> +<sizeparam width="112" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> -<cdrectangleparam minX="0" maxX="431" minY="0" maxY="305" /> -<infoparam name="state0" value="CoffeeDelivered" /> +<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" /> +<infoparam name="Send signal" value="pushTeaButton()" /> <TGConnectingPoint num="0" id="1966" /> <TGConnectingPoint num="1" id="1967" /> <TGConnectingPoint num="2" id="1968" /> @@ -3725,128 +3725,129 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <TGConnectingPoint num="7" id="1973" /> <TGConnectingPoint num="8" id="1974" /> <TGConnectingPoint num="9" id="1975" /> -<TGConnectingPoint num="10" id="1976" /> -<TGConnectingPoint num="11" id="1977" /> -<TGConnectingPoint num="12" id="1978" /> -<TGConnectingPoint num="13" id="1979" /> -<TGConnectingPoint num="14" id="1980" /> -<TGConnectingPoint num="15" id="1981" /> -<TGConnectingPoint num="16" id="1982" /> -<TGConnectingPoint num="17" id="1983" /> -<TGConnectingPoint num="18" id="1984" /> -<TGConnectingPoint num="19" id="1985" /> -<TGConnectingPoint num="20" id="1986" /> -<TGConnectingPoint num="21" id="1987" /> -<TGConnectingPoint num="22" id="1988" /> -<TGConnectingPoint num="23" id="1989" /> -<TGConnectingPoint num="24" id="1990" /> -<TGConnectingPoint num="25" id="1991" /> -<TGConnectingPoint num="26" id="1992" /> -<TGConnectingPoint num="27" id="1993" /> -<TGConnectingPoint num="28" id="1994" /> -<TGConnectingPoint num="29" id="1995" /> -<TGConnectingPoint num="30" id="1996" /> -<TGConnectingPoint num="31" id="1997" /> -<TGConnectingPoint num="32" id="1998" /> -<TGConnectingPoint num="33" id="1999" /> -<TGConnectingPoint num="34" id="2000" /> -<TGConnectingPoint num="35" id="2001" /> -<TGConnectingPoint num="36" id="2002" /> -<TGConnectingPoint num="37" id="2003" /> -<TGConnectingPoint num="38" id="2004" /> -<TGConnectingPoint num="39" id="2005" /> -<TGConnectingPoint num="40" id="2006" /> -<TGConnectingPoint num="41" id="2007" /> -<TGConnectingPoint num="42" id="2008" /> -<TGConnectingPoint num="43" id="2009" /> -<TGConnectingPoint num="44" id="2010" /> -<TGConnectingPoint num="45" id="2011" /> -<TGConnectingPoint num="46" id="2012" /> -<TGConnectingPoint num="47" id="2013" /> -<TGConnectingPoint num="48" id="2014" /> -<TGConnectingPoint num="49" id="2015" /> -<TGConnectingPoint num="50" id="2016" /> -<TGConnectingPoint num="51" id="2017" /> -<TGConnectingPoint num="52" id="2018" /> -<TGConnectingPoint num="53" id="2019" /> -<TGConnectingPoint num="54" id="2020" /> -<TGConnectingPoint num="55" id="2021" /> -<TGConnectingPoint num="56" id="2022" /> -<TGConnectingPoint num="57" id="2023" /> -<TGConnectingPoint num="58" id="2024" /> -<TGConnectingPoint num="59" id="2025" /> -<TGConnectingPoint num="60" id="2026" /> -<TGConnectingPoint num="61" id="2027" /> -<TGConnectingPoint num="62" id="2028" /> -<TGConnectingPoint num="63" id="2029" /> -<TGConnectingPoint num="64" id="2030" /> -<TGConnectingPoint num="65" id="2031" /> -<TGConnectingPoint num="66" id="2032" /> -<TGConnectingPoint num="67" id="2033" /> -<TGConnectingPoint num="68" id="2034" /> -<TGConnectingPoint num="69" id="2035" /> -<TGConnectingPoint num="70" id="2036" /> -<TGConnectingPoint num="71" id="2037" /> -<extraparam> -</extraparam> +<accessibility /> </SUBCOMPONENT> -<SUBCOMPONENT type="5103" id="2049" index="49" uid="9c813d39-192a-47ff-98b2-607e27617acf" > +<SUBCOMPONENT type="5106" id="2049" index="49" uid="542c0583-8080-46a1-9ae2-775c6446817c" > <father id="2219" num="1" /> -<cdparam x="377" y="502" /> -<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="194" y="437" /> +<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> -<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" /> -<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" /> -<TGConnectingPoint num="0" id="2039" /> -<TGConnectingPoint num="1" id="2040" /> -<TGConnectingPoint num="2" id="2041" /> -<TGConnectingPoint num="3" id="2042" /> -<TGConnectingPoint num="4" id="2043" /> -<TGConnectingPoint num="5" id="2044" /> -<TGConnectingPoint num="6" id="2045" /> -<TGConnectingPoint num="7" id="2046" /> -<TGConnectingPoint num="8" id="2047" /> -<TGConnectingPoint num="9" id="2048" /> -<accessibility /> +<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" /> +<infoparam name="state0" value="WaitingForSelection" /> +<TGConnectingPoint num="0" id="1977" /> +<TGConnectingPoint num="1" id="1978" /> +<TGConnectingPoint num="2" id="1979" /> +<TGConnectingPoint num="3" id="1980" /> +<TGConnectingPoint num="4" id="1981" /> +<TGConnectingPoint num="5" id="1982" /> +<TGConnectingPoint num="6" id="1983" /> +<TGConnectingPoint num="7" id="1984" /> +<TGConnectingPoint num="8" id="1985" /> +<TGConnectingPoint num="9" id="1986" /> +<TGConnectingPoint num="10" id="1987" /> +<TGConnectingPoint num="11" id="1988" /> +<TGConnectingPoint num="12" id="1989" /> +<TGConnectingPoint num="13" id="1990" /> +<TGConnectingPoint num="14" id="1991" /> +<TGConnectingPoint num="15" id="1992" /> +<TGConnectingPoint num="16" id="1993" /> +<TGConnectingPoint num="17" id="1994" /> +<TGConnectingPoint num="18" id="1995" /> +<TGConnectingPoint num="19" id="1996" /> +<TGConnectingPoint num="20" id="1997" /> +<TGConnectingPoint num="21" id="1998" /> +<TGConnectingPoint num="22" id="1999" /> +<TGConnectingPoint num="23" id="2000" /> +<TGConnectingPoint num="24" id="2001" /> +<TGConnectingPoint num="25" id="2002" /> +<TGConnectingPoint num="26" id="2003" /> +<TGConnectingPoint num="27" id="2004" /> +<TGConnectingPoint num="28" id="2005" /> +<TGConnectingPoint num="29" id="2006" /> +<TGConnectingPoint num="30" id="2007" /> +<TGConnectingPoint num="31" id="2008" /> +<TGConnectingPoint num="32" id="2009" /> +<TGConnectingPoint num="33" id="2010" /> +<TGConnectingPoint num="34" id="2011" /> +<TGConnectingPoint num="35" id="2012" /> +<TGConnectingPoint num="36" id="2013" /> +<TGConnectingPoint num="37" id="2014" /> +<TGConnectingPoint num="38" id="2015" /> +<TGConnectingPoint num="39" id="2016" /> +<TGConnectingPoint num="40" id="2017" /> +<TGConnectingPoint num="41" id="2018" /> +<TGConnectingPoint num="42" id="2019" /> +<TGConnectingPoint num="43" id="2020" /> +<TGConnectingPoint num="44" id="2021" /> +<TGConnectingPoint num="45" id="2022" /> +<TGConnectingPoint num="46" id="2023" /> +<TGConnectingPoint num="47" id="2024" /> +<TGConnectingPoint num="48" id="2025" /> +<TGConnectingPoint num="49" id="2026" /> +<TGConnectingPoint num="50" id="2027" /> +<TGConnectingPoint num="51" id="2028" /> +<TGConnectingPoint num="52" id="2029" /> +<TGConnectingPoint num="53" id="2030" /> +<TGConnectingPoint num="54" id="2031" /> +<TGConnectingPoint num="55" id="2032" /> +<TGConnectingPoint num="56" id="2033" /> +<TGConnectingPoint num="57" id="2034" /> +<TGConnectingPoint num="58" id="2035" /> +<TGConnectingPoint num="59" id="2036" /> +<TGConnectingPoint num="60" id="2037" /> +<TGConnectingPoint num="61" id="2038" /> +<TGConnectingPoint num="62" id="2039" /> +<TGConnectingPoint num="63" id="2040" /> +<TGConnectingPoint num="64" id="2041" /> +<TGConnectingPoint num="65" id="2042" /> +<TGConnectingPoint num="66" id="2043" /> +<TGConnectingPoint num="67" id="2044" /> +<TGConnectingPoint num="68" id="2045" /> +<TGConnectingPoint num="69" id="2046" /> +<TGConnectingPoint num="70" id="2047" /> +<TGConnectingPoint num="71" id="2048" /> +<latencyCheck /> +<extraparam> +</extraparam> </SUBCOMPONENT> -<SUBCOMPONENT type="5104" id="2060" index="50" uid="f73b994e-357b-446d-a13d-97a66d7a4653" > +<SUBCOMPONENT type="5100" id="2051" index="50" uid="d60fd6d2-14be-4b25-b424-35a9ae5e3ba3" > <father id="2219" num="2" /> +<cdparam x="254" y="401" /> +<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" /> +<infoparam name="start state" value="null" /> +<TGConnectingPoint num="0" id="2050" /> +</SUBCOMPONENT> +<SUBCOMPONENT type="5104" id="2062" index="51" uid="f73b994e-357b-446d-a13d-97a66d7a4653" > +<father id="2219" num="3" /> <cdparam x="63" y="529" /> <sizeparam width="127" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> <cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" /> <infoparam name="Send signal" value="pushCoffeeButton()" /> -<TGConnectingPoint num="0" id="2050" /> -<TGConnectingPoint num="1" id="2051" /> -<TGConnectingPoint num="2" id="2052" /> -<TGConnectingPoint num="3" id="2053" /> -<TGConnectingPoint num="4" id="2054" /> -<TGConnectingPoint num="5" id="2055" /> -<TGConnectingPoint num="6" id="2056" /> -<TGConnectingPoint num="7" id="2057" /> -<TGConnectingPoint num="8" id="2058" /> -<TGConnectingPoint num="9" id="2059" /> +<TGConnectingPoint num="0" id="2052" /> +<TGConnectingPoint num="1" id="2053" /> +<TGConnectingPoint num="2" id="2054" /> +<TGConnectingPoint num="3" id="2055" /> +<TGConnectingPoint num="4" id="2056" /> +<TGConnectingPoint num="5" id="2057" /> +<TGConnectingPoint num="6" id="2058" /> +<TGConnectingPoint num="7" id="2059" /> +<TGConnectingPoint num="8" id="2060" /> +<TGConnectingPoint num="9" id="2061" /> <accessibility /> </SUBCOMPONENT> -<SUBCOMPONENT type="5100" id="2062" index="51" uid="d60fd6d2-14be-4b25-b424-35a9ae5e3ba3" > -<father id="2219" num="3" /> -<cdparam x="254" y="401" /> -<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" /> -<infoparam name="start state" value="null" /> -<TGConnectingPoint num="0" id="2061" /> -</SUBCOMPONENT> -<SUBCOMPONENT type="5106" id="2135" index="52" uid="542c0583-8080-46a1-9ae2-775c6446817c" > +<SUBCOMPONENT type="5103" id="2073" index="52" uid="9c813d39-192a-47ff-98b2-607e27617acf" > <father id="2219" num="4" /> -<cdparam x="194" y="437" /> -<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="377" y="502" /> +<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> -<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" /> -<infoparam name="state0" value="WaitingForSelection" /> +<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" /> +<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" /> <TGConnectingPoint num="0" id="2063" /> <TGConnectingPoint num="1" id="2064" /> <TGConnectingPoint num="2" id="2065" /> @@ -3857,91 +3858,90 @@ CoffeeMachine.CoffeeDelivered --> CoffeeMachine.nbOfCoins<2 <TGConnectingPoint num="7" id="2070" /> <TGConnectingPoint num="8" id="2071" /> <TGConnectingPoint num="9" id="2072" /> -<TGConnectingPoint num="10" id="2073" /> -<TGConnectingPoint num="11" id="2074" /> -<TGConnectingPoint num="12" id="2075" /> -<TGConnectingPoint num="13" id="2076" /> -<TGConnectingPoint num="14" id="2077" /> -<TGConnectingPoint num="15" id="2078" /> -<TGConnectingPoint num="16" id="2079" /> -<TGConnectingPoint num="17" id="2080" /> -<TGConnectingPoint num="18" id="2081" /> -<TGConnectingPoint num="19" id="2082" /> -<TGConnectingPoint num="20" id="2083" /> -<TGConnectingPoint num="21" id="2084" /> -<TGConnectingPoint num="22" id="2085" /> -<TGConnectingPoint num="23" id="2086" /> -<TGConnectingPoint num="24" id="2087" /> -<TGConnectingPoint num="25" id="2088" /> -<TGConnectingPoint num="26" id="2089" /> -<TGConnectingPoint num="27" id="2090" /> -<TGConnectingPoint num="28" id="2091" /> -<TGConnectingPoint num="29" id="2092" /> -<TGConnectingPoint num="30" id="2093" /> -<TGConnectingPoint num="31" id="2094" /> -<TGConnectingPoint num="32" id="2095" /> -<TGConnectingPoint num="33" id="2096" /> -<TGConnectingPoint num="34" id="2097" /> -<TGConnectingPoint num="35" id="2098" /> -<TGConnectingPoint num="36" id="2099" /> -<TGConnectingPoint num="37" id="2100" /> -<TGConnectingPoint num="38" id="2101" /> -<TGConnectingPoint num="39" id="2102" /> -<TGConnectingPoint num="40" id="2103" /> -<TGConnectingPoint num="41" id="2104" /> -<TGConnectingPoint num="42" id="2105" /> -<TGConnectingPoint num="43" id="2106" /> -<TGConnectingPoint num="44" id="2107" /> -<TGConnectingPoint num="45" id="2108" /> -<TGConnectingPoint num="46" id="2109" /> -<TGConnectingPoint num="47" id="2110" /> -<TGConnectingPoint num="48" id="2111" /> -<TGConnectingPoint num="49" id="2112" /> -<TGConnectingPoint num="50" id="2113" /> -<TGConnectingPoint num="51" id="2114" /> -<TGConnectingPoint num="52" id="2115" /> -<TGConnectingPoint num="53" id="2116" /> -<TGConnectingPoint num="54" id="2117" /> -<TGConnectingPoint num="55" id="2118" /> -<TGConnectingPoint num="56" id="2119" /> -<TGConnectingPoint num="57" id="2120" /> -<TGConnectingPoint num="58" id="2121" /> -<TGConnectingPoint num="59" id="2122" /> -<TGConnectingPoint num="60" id="2123" /> -<TGConnectingPoint num="61" id="2124" /> -<TGConnectingPoint num="62" id="2125" /> -<TGConnectingPoint num="63" id="2126" /> -<TGConnectingPoint num="64" id="2127" /> -<TGConnectingPoint num="65" id="2128" /> -<TGConnectingPoint num="66" id="2129" /> -<TGConnectingPoint num="67" id="2130" /> -<TGConnectingPoint num="68" id="2131" /> -<TGConnectingPoint num="69" id="2132" /> -<TGConnectingPoint num="70" id="2133" /> -<TGConnectingPoint num="71" id="2134" /> -<latencyCheck /> -<extraparam> -</extraparam> +<accessibility /> </SUBCOMPONENT> -<SUBCOMPONENT type="5104" id="2146" index="53" uid="8718a1dd-4942-43e5-b6ce-b5f78b82a355" > +<SUBCOMPONENT type="5106" id="2146" index="53" uid="52044bb2-8b01-4108-a1ac-b5e7886ea624" > <father id="2219" num="5" /> -<cdparam x="242" y="529" /> -<sizeparam width="112" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="53" y="653" /> +<sizeparam width="146" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <enabled value="true" /> -<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" /> -<infoparam name="Send signal" value="pushTeaButton()" /> -<TGConnectingPoint num="0" id="2136" /> -<TGConnectingPoint num="1" id="2137" /> -<TGConnectingPoint num="2" id="2138" /> -<TGConnectingPoint num="3" id="2139" /> -<TGConnectingPoint num="4" id="2140" /> -<TGConnectingPoint num="5" id="2141" /> -<TGConnectingPoint num="6" id="2142" /> -<TGConnectingPoint num="7" id="2143" /> -<TGConnectingPoint num="8" id="2144" /> -<TGConnectingPoint num="9" id="2145" /> -<accessibility /> +<cdrectangleparam minX="0" maxX="431" minY="0" maxY="305" /> +<infoparam name="state0" value="CoffeeDelivered" /> +<TGConnectingPoint num="0" id="2074" /> +<TGConnectingPoint num="1" id="2075" /> +<TGConnectingPoint num="2" id="2076" /> +<TGConnectingPoint num="3" id="2077" /> +<TGConnectingPoint num="4" id="2078" /> +<TGConnectingPoint num="5" id="2079" /> +<TGConnectingPoint num="6" id="2080" /> +<TGConnectingPoint num="7" id="2081" /> +<TGConnectingPoint num="8" id="2082" /> +<TGConnectingPoint num="9" id="2083" /> +<TGConnectingPoint num="10" id="2084" /> +<TGConnectingPoint num="11" id="2085" /> +<TGConnectingPoint num="12" id="2086" /> +<TGConnectingPoint num="13" id="2087" /> +<TGConnectingPoint num="14" id="2088" /> +<TGConnectingPoint num="15" id="2089" /> +<TGConnectingPoint num="16" id="2090" /> +<TGConnectingPoint num="17" id="2091" /> +<TGConnectingPoint num="18" id="2092" /> +<TGConnectingPoint num="19" id="2093" /> +<TGConnectingPoint num="20" id="2094" /> +<TGConnectingPoint num="21" id="2095" /> +<TGConnectingPoint num="22" id="2096" /> +<TGConnectingPoint num="23" id="2097" /> +<TGConnectingPoint num="24" id="2098" /> +<TGConnectingPoint num="25" id="2099" /> +<TGConnectingPoint num="26" id="2100" /> +<TGConnectingPoint num="27" id="2101" /> +<TGConnectingPoint num="28" id="2102" /> +<TGConnectingPoint num="29" id="2103" /> +<TGConnectingPoint num="30" id="2104" /> +<TGConnectingPoint num="31" id="2105" /> +<TGConnectingPoint num="32" id="2106" /> +<TGConnectingPoint num="33" id="2107" /> +<TGConnectingPoint num="34" id="2108" /> +<TGConnectingPoint num="35" id="2109" /> +<TGConnectingPoint num="36" id="2110" /> +<TGConnectingPoint num="37" id="2111" /> +<TGConnectingPoint num="38" id="2112" /> +<TGConnectingPoint num="39" id="2113" /> +<TGConnectingPoint num="40" id="2114" /> +<TGConnectingPoint num="41" id="2115" /> +<TGConnectingPoint num="42" id="2116" /> +<TGConnectingPoint num="43" id="2117" /> +<TGConnectingPoint num="44" id="2118" /> +<TGConnectingPoint num="45" id="2119" /> +<TGConnectingPoint num="46" id="2120" /> +<TGConnectingPoint num="47" id="2121" /> +<TGConnectingPoint num="48" id="2122" /> +<TGConnectingPoint num="49" id="2123" /> +<TGConnectingPoint num="50" id="2124" /> +<TGConnectingPoint num="51" id="2125" /> +<TGConnectingPoint num="52" id="2126" /> +<TGConnectingPoint num="53" id="2127" /> +<TGConnectingPoint num="54" id="2128" /> +<TGConnectingPoint num="55" id="2129" /> +<TGConnectingPoint num="56" id="2130" /> +<TGConnectingPoint num="57" id="2131" /> +<TGConnectingPoint num="58" id="2132" /> +<TGConnectingPoint num="59" id="2133" /> +<TGConnectingPoint num="60" id="2134" /> +<TGConnectingPoint num="61" id="2135" /> +<TGConnectingPoint num="62" id="2136" /> +<TGConnectingPoint num="63" id="2137" /> +<TGConnectingPoint num="64" id="2138" /> +<TGConnectingPoint num="65" id="2139" /> +<TGConnectingPoint num="66" id="2140" /> +<TGConnectingPoint num="67" id="2141" /> +<TGConnectingPoint num="68" id="2142" /> +<TGConnectingPoint num="69" id="2143" /> +<TGConnectingPoint num="70" id="2144" /> +<TGConnectingPoint num="71" id="2145" /> +<extraparam> +</extraparam> </SUBCOMPONENT> diff --git a/src/main/resources/help/requirements.html b/src/main/resources/help/requirements.html index 69418dca30..3a88d9d264 100644 --- a/src/main/resources/help/requirements.html +++ b/src/main/resources/help/requirements.html @@ -6,136 +6,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> <title>TTool help</title> <style> - html { - line-height: 1.5; - font-family: Georgia, serif; - font-size: 20px; - color: #1a1a1a; - background-color: #fdfdfd; - } - body { - margin: 0 auto; - max-width: 36em; - padding-left: 50px; - padding-right: 50px; - padding-top: 50px; - padding-bottom: 50px; - hyphens: auto; - word-wrap: break-word; - text-rendering: optimizeLegibility; - font-kerning: normal; - } - @media (max-width: 600px) { - body { - font-size: 0.9em; - padding: 1em; - } - } - @media print { - body { - background-color: transparent; - color: black; - font-size: 12pt; - } - p, h2, h3 { - orphans: 3; - widows: 3; - } - h2, h3, h4 { - page-break-after: avoid; - } - } - p { - margin: 1em 0; - } - a { - color: #1a1a1a; - } - a:visited { - color: #1a1a1a; - } - img { - max-width: 100%; - } - h1, h2, h3, h4, h5, h6 { - margin-top: 1.4em; - } - h5, h6 { - font-size: 1em; - font-style: italic; - } - h6 { - font-weight: normal; - } - ol, ul { - padding-left: 1.7em; - margin-top: 1em; - } - li > ol, li > ul { - margin-top: 0; - } - blockquote { - margin: 1em 0 1em 1.7em; - padding-left: 1em; - border-left: 2px solid #e6e6e6; - color: #606060; - } - code { - font-family: Menlo, Monaco, 'Lucida Console', Consolas, monospace; - font-size: 85%; - margin: 0; - } - pre { - margin: 1em 0; - overflow: auto; - } - pre code { - padding: 0; - overflow: visible; - } - .sourceCode { - background-color: transparent; - overflow: visible; - } - hr { - background-color: #1a1a1a; - border: none; - height: 1px; - margin: 1em 0; - } - table { - margin: 1em 0; - border-collapse: collapse; - width: 100%; - overflow-x: auto; - display: block; - font-variant-numeric: lining-nums tabular-nums; - } - table caption { - margin-bottom: 0.75em; - } - tbody { - margin-top: 0.5em; - border-top: 1px solid #1a1a1a; - border-bottom: 1px solid #1a1a1a; - } - th { - border-top: 1px solid #1a1a1a; - padding: 0.25em 0.5em 0.25em 0.5em; - } - td { - padding: 0.125em 0.5em 0.25em 0.5em; - } - header { - margin-bottom: 4em; - text-align: center; - } - #TOC li { - list-style: none; - } - #TOC a:not(:hover) { - text-decoration: none; - } code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} span.underline{text-decoration: underline;} @@ -144,6 +14,7 @@ ul.task-list{list-style: none;} .display.math{display: block; text-align: center; margin: 0.5rem auto;} </style> + <link rel="stylesheet" href="/Users/ludovicapvrille/TTool/src/main/resources/help/help.css" /> <!--[if lt IE 9]> <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script> <![endif]--> -- GitLab