diff --git a/Doc/Tdoc/Ref/Docbook/multipleAuthors.svg b/Doc/Tdoc/Ref/Docbook/multipleAuthors.svg index 6b775e1cc7a652350d1d0a7e2daacf5206086b31..aab06b8f1b8d316cc2624daf656c9428d49fcd95 100644 --- a/Doc/Tdoc/Ref/Docbook/multipleAuthors.svg +++ b/Doc/Tdoc/Ref/Docbook/multipleAuthors.svg @@ -12,10 +12,10 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="multipleAuthors.svg" - inkscape:version="0.92.1 r15371" + inkscape:version="0.92.3 (2405546, 2018-03-11)" version="1.2" id="svg2" - height="106mm" + height="75mm" width="150mm"> <sodipodi:namedview id="base" @@ -25,17 +25,17 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="2.1341392" - inkscape:cx="283.46457" - inkscape:cy="200.31496" + inkscape:cx="340.63048" + inkscape:cy="125.34328" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1600" - inkscape:window-height="1090" + inkscape:window-height="1145" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" - showguides="false" + showguides="true" inkscape:guide-bbox="true" units="mm"> <inkscape:grid @@ -47,16 +47,17 @@ <marker inkscape:stockid="Arrow1Lstart" orient="auto" - refY="0.0" - refX="0.0" + refY="0" + refX="0" id="marker17735" style="overflow:visible" inkscape:isstock="true"> <path id="path17472" - d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1" - transform="scale(0.8) translate(12.5,0)" /> + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(0.8,0,0,0.8,10,0)" + inkscape:connector-curvature="0" /> </marker> <marker inkscape:isstock="true" @@ -943,7 +944,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -951,7 +952,7 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-721.8898)"> + transform="translate(0,-839.05515)"> <text xml:space="preserve" style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672" @@ -965,7 +966,7 @@ style="font-size:42.66666794px;line-height:1.25;font-family:sans-serif;stroke-width:1.06666672"> </tspan></text> <g id="g16095" - transform="matrix(0.21138288,0,0,0.21138288,-2.6000317,727.6055)"> + transform="matrix(0.21138288,0,0,0.21138288,-10.9329,836.29456)"> <path transform="matrix(1.699686,0,0,1.625496,-479.1629,-395.0527)" style="fill:#ffd6cc;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.25607991;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" @@ -1073,7 +1074,7 @@ </g> <g id="g16238" - transform="matrix(0.21717141,0,0,0.21717141,1.4662529,1011.9825)"> + transform="matrix(0.21717141,0,0,0.21717141,-3.1932691,1018.1152)"> <path transform="matrix(4.429093,0,0,3.741145,-949.1415,-252.9617)" style="fill:#ccaa18;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.92123801;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" @@ -1191,7 +1192,7 @@ </g> <g id="g16259" - transform="matrix(0.24363108,0,0,0.24363108,450.92182,1006.1866)"> + transform="matrix(0.24363108,0,0,0.24363108,457.40521,1013.4577)"> <path transform="matrix(2.050753,0,0,2.11881,-644.5378,-238.8273)" style="font-size:12px;fill:#ffd9d9;fill-rule:evenodd;stroke:#000000;stroke-width:1.79899001" @@ -1238,7 +1239,7 @@ </g> <g id="g5" - transform="matrix(0.17780516,0,0,0.17780516,461.45587,730.99629)"> + transform="matrix(0.17780516,0,0,0.17780516,468.84528,839.9729)"> <path id="path7" style="fill-rule:evenodd;stroke:#000000;stroke-width:0.036;stroke-miterlimit:10" @@ -1397,7 +1398,7 @@ </g> <g id="g21240" - transform="translate(23.0233,-17.107979)"> + transform="translate(16.023,40.892019)"> <circle r="100" cy="944.51373" @@ -1502,86 +1503,82 @@ </g> <text xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333333px;line-height:1.25;font-family:'Courier 10 Pitch';-inkscape-font-specification:'Courier 10 Pitch';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;" - x="150" - y="752.51971" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:'Courier 10 Pitch';-inkscape-font-specification:'Courier 10 Pitch';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" + x="161.71432" + y="730.0282" id="text16453"><tspan sodipodi:role="line" id="tspan16451" - x="150" - y="752.51971">Multiple Authors</tspan></text> + x="161.71432" + y="730.0282">Multiple Authors</tspan></text> <path style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker17735);marker-end:url(#marker2318)" - d="m 90,822.51972 150,100" + d="m 85,912.51972 150,70" id="path16455" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker17735-8);marker-end:url(#marker2318-8)" - d="m 320,922.51972 130,-90" + d="m 310,992.51972 150,-65" id="path16455-4" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker17735-3);marker-end:url(#marker2318-4)" - d="m 330,992.51972 110,69.99998" + d="m 315,1032.5197 145,35" id="path16455-2" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker17735-0);marker-end:url(#marker2318-9)" - d="M 240,972.51972 120,1042.5197" + d="m 230,1022.5197 -115,50" id="path16455-6" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:'Courier 10 Pitch';-inkscape-font-specification:'Courier 10 Pitch';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" - x="126.08579" - y="933.29126" + x="118.14835" + y="995.03986" id="text22072"><tspan sodipodi:role="line" id="tspan22070" - x="126.08579" - y="933.29126">Edit</tspan></text> + x="118.14835" + y="995.03986">Edit</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:'Courier 10 Pitch';-inkscape-font-specification:'Courier 10 Pitch';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" - x="230.85081" - y="811.77087" + x="249.59373" + y="767.25647" id="text22076"><tspan sodipodi:role="line" id="tspan22074" - x="230.85081" - y="811.77087">check out</tspan></text> + x="249.59373" + y="767.25647">check out</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:'Courier 10 Pitch';-inkscape-font-specification:'Courier 10 Pitch';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" - x="238.188" - y="1054.36" + x="236.78229" + y="1110.5889" id="text22080"><tspan sodipodi:role="line" id="tspan22078" - x="238.188" - y="1054.36">check in</tspan></text> + x="236.78229" + y="1110.5889">create</tspan></text> <text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:'Courier 10 Pitch';-inkscape-font-specification:'Courier 10 Pitch Bold';letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none" - x="397.50284" - y="900.64545" + x="188.07899" + y="866.80511" id="text255"><tspan sodipodi:role="line" - id="tspan253" - x="397.50284" - y="900.64545">Merge</tspan><tspan - sodipodi:role="line" - x="397.50284" - y="927.31213" - id="tspan375">conflicts</tspan></text> + x="188.07899" + y="866.80511" + id="tspan375">Merge conflicts</tspan></text> <g inkscape:label="Ebene 1" id="layer1-6" - transform="translate(398.49079,930.25316)"> + transform="translate(393.63836,839.33558)"> <g transform="translate(-185.678,-111.5384)" style="stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none" @@ -1599,6 +1596,16 @@ inkscape:connector-curvature="0" /> </g> </g> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:'Courier 10 Pitch';-inkscape-font-specification:'Courier 10 Pitch';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" + x="398.22903" + y="998.89148" + id="text22080-3"><tspan + sodipodi:role="line" + id="tspan22078-6" + x="398.22903" + y="998.89148">delete</tspan></text> </g> <script ns1:version="14.10-05142318"