diff options
author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2021-04-05 14:05:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-05 14:05:29 +0200 |
commit | 40db30b6f17bef97d853c01c831fb61ec9bd358e (patch) | |
tree | db99871ee6a491794cb3c8885e53141464cc6c6e | |
parent | 390eeb6335be4408e2427232f2531ed2431f745c (diff) | |
parent | 237b98f958f1a8c30d1ed3974a9e2ec8e154f2b8 (diff) |
Merge pull request #3754 from ronso0/keyboard-shortcut-pdf
include keyboard shortcuts PDF, disable debian doc compression
-rw-r--r-- | CMakeLists.txt | 8 | ||||
-rw-r--r-- | packaging/debian/mixxx.sgml | 10 | ||||
-rwxr-xr-x | packaging/debian/rules | 3 | ||||
-rw-r--r-- | res/Mixxx-Keyboard-Shortcuts.pdf | bin | 0 -> 206495 bytes | |||
-rw-r--r-- | res/Mixxx-Manual.pdf (renamed from Mixxx-Manual.pdf) | bin | 3825841 -> 3825841 bytes | |||
-rw-r--r-- | res/images/templates/ic_template_keyboard_mapping_sheet.svg | 3048 | ||||
-rw-r--r-- | src/config.h.in | 1 | ||||
-rw-r--r-- | src/defs_urls.h | 1 | ||||
-rw-r--r-- | src/widget/wmainmenubar.cpp | 85 |
9 files changed, 1743 insertions, 1413 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fe08a9cece..33a0aa636a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1134,6 +1134,7 @@ elseif (UNIX) set(MIXXX_INSTALL_LICENSEDIR "${CMAKE_INSTALL_DOCDIR}") endif() + if(WIN32) target_compile_definitions(mixxx-lib PRIVATE __WINDOWS__) @@ -1342,7 +1343,8 @@ install( install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/README" - "${CMAKE_CURRENT_SOURCE_DIR}/Mixxx-Manual.pdf" + "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf" + "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Keyboard-Shortcuts.pdf" DESTINATION "${MIXXX_INSTALL_DOCDIR}" ) @@ -2638,6 +2640,10 @@ if(WAVPACK) target_link_libraries(mixxx-lib PUBLIC WavPack::wavpack) endif() +# Configure file with build options +file(RELATIVE_PATH MIXXX_INSTALL_DOCDIR_RELATIVE_TO_DATADIR "${CMAKE_INSTALL_PREFIX}/${MIXXX_INSTALL_DATADIR}" "${CMAKE_INSTALL_PREFIX}/${MIXXX_INSTALL_DOCDIR}") +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/config.h" @ONLY) + # Packaging set(CPACK_PACKAGE_VENDOR "Mixxx Project") set(CPACK_PACKAGE_CONTACT "RJ Skerry-Ryan <rryan@mixxx.org>") diff --git a/packaging/debian/mixxx.sgml b/packaging/debian/mixxx.sgml index 9277b5cb23..90e1c1e82d 100644 --- a/packaging/debian/mixxx.sgml +++ b/packaging/debian/mixxx.sgml @@ -363,6 +363,16 @@ manpage.1: manpage.sgml </para> </listitem> </varlistentry> + <varlistentry> + <term> + <filename class='directory'>/usr/share/doc/mixxx/Mixxx-Keyboard-Shortcuts.pdf</filename> + </term> + <listitem> + <para> + An overview of the default keyboard shortcuts in pdf format. + </para> + </listitem> + </varlistentry> </variablelist> </refsect1> diff --git a/packaging/debian/rules b/packaging/debian/rules index a32353631d..6ee3069343 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -9,5 +9,8 @@ override_dh_auto_configure: override_dh_installudev: dh_installudev --name=mixxx-usb-uaccess --priority 69 +override_dh_compress: + dh_compress -X.pdf + %: dh $@ --buildsystem=cmake diff --git a/res/Mixxx-Keyboard-Shortcuts.pdf b/res/Mixxx-Keyboard-Shortcuts.pdf Binary files differnew file mode 100644 index 0000000000..3e5623f8eb --- /dev/null +++ b/res/Mixxx-Keyboard-Shortcuts.pdf diff --git a/Mixxx-Manual.pdf b/res/Mixxx-Manual.pdf Binary files differindex c82442963a..c82442963a 100644 --- a/Mixxx-Manual.pdf +++ b/res/Mixxx-Manual.pdf diff --git a/res/images/templates/ic_template_keyboard_mapping_sheet.svg b/res/images/templates/ic_template_keyboard_mapping_sheet.svg index 40d49c60af..6b921e8698 100644 --- a/res/images/templates/ic_template_keyboard_mapping_sheet.svg +++ b/res/images/templates/ic_template_keyboard_mapping_sheet.svg @@ -1,6 +1,4 @@ <?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#" @@ -11,13 +9,13 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="ic_template_keyboard_mapping_sheet.svg" - inkscape:version="0.92.4 (unknown)" + inkscape:version="1.0.1 (0767f8302a, 2020-10-17)" style="display:inline" xml:space="preserve" id="Layer_1" - viewBox="0 0 782.36219 241.88977" - height="64mm" - width="207mm" + viewBox="0 0 782 395" + height="395" + width="782" version="1.1"><sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -27,20 +25,20 @@ guidetolerance="10" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="740" + inkscape:window-width="1920" + inkscape:window-height="1056" id="namedview8739" showgrid="false" - inkscape:zoom="0.5" - inkscape:cx="358.32035" - inkscape:cy="266.48173" + inkscape:zoom="2.7869995" + inkscape:cx="255.18168" + inkscape:cy="175.81754" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="g3458" showguides="true" inkscape:guide-bbox="true" - units="mm" + units="px" inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:snap-page="true" @@ -48,7 +46,9 @@ inkscape:snap-bbox-edge-midpoints="true" inkscape:snap-bbox-midpoints="true" inkscape:object-paths="true" - inkscape:snap-smooth-nodes="true" /><title + inkscape:snap-smooth-nodes="true" + inkscape:document-rotation="0" + viewbox-y="0" /><title id="title33436">Mixxx Keyboard mapping sheet template</title><metadata id="metadata25289"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type @@ -58,7 +58,12 @@ rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata><defs - id="defs25287"><linearGradient + id="defs25287"><rect + x="-20.352678" + y="537.45685" + width="805.13287" + height="429.64145" + id="rect5209" /><linearGradient x1="0" y1="0" x2="1" @@ -373,12 +378,6 @@ stdDeviation="0.1587275" id="feGaussianBlur5707" /></filter><filter inkscape:collect="always" - id="filter5705-7" - style="color-interpolation-filters:sRGB"><feGaussianBlur - inkscape:collect="always" - stdDeviation="0.1587275" - id="feGaussianBlur5707-5" /></filter><filter - inkscape:collect="always" id="filter5705-4" style="color-interpolation-filters:sRGB"><feGaussianBlur inkscape:collect="always" @@ -408,12 +407,12 @@ inkscape:groupmode="layer" id="layer3" inkscape:label="background" - style="display:inline" + style="display:none" transform="translate(0,-586.55123)"><g id="g13841" inkscape:export-xdpi="148.3222" inkscape:export-ydpi="148.3222" - transform="translate(-10.910896,294.33131)"><path + transform="translate(-10.910896,317.33139)"><path d="M 24.554976,302.44599 H 779.62798 c 4.573,0 8.315,3.671 8.315,8.158 v 211.838 c 0,4.487 -3.742,8.158 -8.315,8.158 H 24.554976 c -4.573,0 -8.314,-3.671 -8.314,-8.158 v -211.838 c 0,-4.487 3.741,-8.158 8.314,-8.158 z" id="path24070" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient23873);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-opacity:1;marker:none;enable-background:accumulate" @@ -422,7 +421,7 @@ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient24074);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-opacity:1;marker:none;enable-background:accumulate" id="path62" d="M 22.598071,295.44599 H 781.58492 c 4.5967,0 8.3581,3.73536 8.3581,8.30103 v 215.55196 c 0,4.56566 -3.7614,8.30102 -8.3581,8.30102 H 22.598071 c -4.596703,0 -8.357094,-3.73536 -8.357094,-8.30102 V 303.74702 c 0,-4.56567 3.760391,-8.30103 8.357094,-8.30103 z" /></g><g - transform="matrix(0.64387797,0,0,0.64387797,268.97383,480.53112)" + transform="matrix(0.64387797,0,0,0.64387797,268.97383,503.5312)" id="g32433" style="display:inline;opacity:0.8;fill:#ffffff;fill-opacity:1"><g transform="translate(601.05478,-183.25433)" @@ -431,59 +430,55 @@ id="g32437" style="fill:#ffffff;fill-opacity:1"><polygon id="polygon32439" - points="80.68,412.503 91.126,412.503 67.51,378.058 57.065,378.058 " - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39442992;marker:none;enable-background:accumulate" /><polygon + points="67.51,378.058 57.065,378.058 80.68,412.503 91.126,412.503 " + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;enable-background:accumulate" /><polygon id="polygon32441" - points="104.342,412.503 114.787,412.503 91.167,378.058 80.722,378.058 " - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39442992;marker:none;enable-background:accumulate" /><polygon + points="91.167,378.058 80.722,378.058 104.342,412.503 114.787,412.503 " + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;enable-background:accumulate" /><polygon id="polygon32443" - points="127.999,412.503 138.443,412.503 114.823,378.058 104.378,378.058 " - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39442992;marker:none;enable-background:accumulate" /><rect + points="114.823,378.058 104.378,378.058 127.999,412.503 138.443,412.503 " + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;enable-background:accumulate" /><rect id="rect32445" height="34.445" width="8.934" y="378.05801" x="44.568001" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39442992;marker:none;enable-background:accumulate" /><polygon + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;enable-background:accumulate" /><polygon id="polygon32447" points="8.76,412.503 8.76,392.331 20.076,409.508 20.307,409.508 31.74,392.157 31.74,412.503 40.618,412.503 40.618,378.058 30.988,378.058 20.307,395.233 9.631,378.058 0,378.058 0,412.503 " - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39442992;marker:none;enable-background:accumulate" /></g></g><path + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;enable-background:accumulate" /></g></g><path d="m 687.59179,220.76768 5.222,7.617 5.383,-7.852 -5.222,-7.615 z m -11.829,-17.253 5.223,7.619 5.382,-7.85 -5.224,-7.617 z m 53.291,-8.711 -5.976,8.714 5.221,7.614 11.195,-16.328 z m -70.937,34.445 h 10.448 l 5.973,-8.712 -5.224,-7.619 z m 53.133,-8.482 5.222,7.615 5.381,-7.848 -5.222,-7.615 z m -11.828,-17.25 5.221,7.614 5.381,-7.848 -5.221,-7.613 z" id="path32449" inkscape:connector-curvature="0" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39442992;marker:none;enable-background:accumulate" /></g><g + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;enable-background:accumulate" /></g><g style="display:inline" id="g31486" - transform="matrix(0.64387797,0,0,0.64387797,268.97383,479.6031)"><g + transform="matrix(0.64387797,0,0,0.64387797,268.97383,502.60318)"><g id="g31339" transform="translate(601.05478,-183.25433)"><g id="g28148"><polygon - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient32171);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39442992;marker:none;filter:url(#filter31837-0);enable-background:accumulate" - points="91.126,412.503 67.51,378.058 57.065,378.058 80.68,412.503 " + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient32171);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;filter:url(#filter31837-0);enable-background:accumulate" + points="57.065,378.058 80.68,412.503 91.126,412.503 67.51,378.058 " id="polygon28150" /><polygon - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient32173);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39442992;marker:none;filter:url(#filter31837-75);enable-background:accumulate" - points="114.787,412.503 91.167,378.058 80.722,378.058 104.342,412.503 " + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient32173);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;filter:url(#filter31837-75);enable-background:accumulate" + points="80.722,378.058 104.342,412.503 114.787,412.503 91.167,378.058 " id="polygon28152" /><polygon - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient23873-2-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39442992;marker:none;filter:url(#filter31837-75);enable-background:accumulate" - points="138.443,412.503 114.823,378.058 104.378,378.058 127.999,412.503 " + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient23873-2-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;filter:url(#filter31837-75);enable-background:accumulate" + points="104.378,378.058 127.999,412.503 138.443,412.503 114.823,378.058 " id="polygon28154" /><rect - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient23873-2-9);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39442992;marker:none;filter:url(#filter31837-1);enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient23873-2-9);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;filter:url(#filter31837-1);enable-background:accumulate" x="44.568001" y="378.05801" width="8.934" height="34.445" id="rect28156" /><polygon - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient23873-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39442992;marker:none;filter:url(#filter31837);enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient23873-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;filter:url(#filter31837);enable-background:accumulate" points="8.76,392.331 20.076,409.508 20.307,409.508 31.74,392.157 31.74,412.503 40.618,412.503 40.618,378.058 30.988,378.058 20.307,395.233 9.631,378.058 0,378.058 0,412.503 8.76,412.503 " id="polygon28158" /></g></g><path - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient23873-2-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39442992;marker:none;filter:url(#filter31837-0);enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient23873-2-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39443;marker:none;filter:url(#filter31837-0);enable-background:accumulate" inkscape:connector-curvature="0" id="path28160" - d="m 687.59179,220.76768 5.222,7.617 5.383,-7.852 -5.222,-7.615 z m -11.829,-17.253 5.223,7.619 5.382,-7.85 -5.224,-7.617 z m 53.291,-8.711 -5.976,8.714 5.221,7.614 11.195,-16.328 z m -70.937,34.445 h 10.448 l 5.973,-8.712 -5.224,-7.619 z m 53.133,-8.482 5.222,7.615 5.381,-7.848 -5.222,-7.615 z m -11.828,-17.25 5.221,7.614 5.381,-7.848 -5.221,-7.613 z" /></g></g><polygon - points="0,548.168 0,280.191 807.465,280.191 807.465,548.168 " - id="polygon16587" - style="fill:none" - transform="translate(-7.6960678,-291.22775)" /> + d="m 687.59179,220.76768 5.222,7.617 5.383,-7.852 -5.222,-7.615 z m -11.829,-17.253 5.223,7.619 5.382,-7.85 -5.224,-7.617 z m 53.291,-8.711 -5.976,8.714 5.221,7.614 11.195,-16.328 z m -70.937,34.445 h 10.448 l 5.973,-8.712 -5.224,-7.619 z m 53.133,-8.482 5.222,7.615 5.381,-7.848 -5.222,-7.615 z m -11.828,-17.25 5.221,7.614 5.381,-7.848 -5.221,-7.613 z" /></g></g> <g style="display:inline" inkscape:label="mapping overlay" @@ -583,40 +578,40 @@ offset="0.80000001" style="stop-color:#e7e8e9;stop-opacity:1" id="stop1986" /></linearGradient></g><g - transform="matrix(1,0,0,0.99960185,9.6383124,-155.0777)" + transform="matrix(1,0,0,0.99960185,9.6383124,-132.07762)" id="g2000" style="display:inline"><path sodipodi:nodetypes="ssssssccccsssscs" d="m 453.48234,868.59228 c 6.10055,0 -0.70158,0 5.39896,0 1.30691,0 2.05107,0.768 2.05107,2.01 v 29.12497 c 0,1.039 0.83096,1.891 1.84431,1.891 h 42.8319 c 1.01335,0 1.78091,-0.85397 1.84333,-1.891 v -32.406 l -9.7e-4,-0.075 9.7e-4,-0.075 v -27.926 c 0,-1.039 -0.82998,-1.891 -1.84333,-1.891 h -52.12429 c -1.01431,0 -1.8443,0.851 -1.8443,1.891 v 27.45703 c -0.002,1.04 0.82804,1.89 1.84235,1.89 z" id="path1992" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#606163;fill-opacity:1;fill-rule:evenodd;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter23959-5);enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#606163;fill-opacity:1;fill-rule:evenodd;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter23959-5);enable-background:accumulate" inkscape:connector-curvature="0" /><g transform="matrix(1,0,0,-1,0.56998953,1560.1496)" id="g1994" /><g transform="matrix(1,0,0,-1,22.869988,1560.1496)" id="g1996" /><path inkscape:connector-curvature="0" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.0001992;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.0002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="path1998" d="m 454.40634,867.61223 c 5.89227,0 -0.37781,4.1e-4 5.51445,4.1e-4 1.26229,0 1.98104,0.74078 1.98104,1.93879 v 29.10469 c 0,1.00218 0.80259,1.824 1.78135,1.82399 l 41.00143,-4.1e-4 c 0.97876,-10e-6 1.72011,-0.82371 1.7804,-1.82399 v -31.2579 l -9.4e-4,-0.0724 9.4e-4,-0.0724 v -26.93663 c 0,-1.00218 -0.80164,-1.82399 -1.7804,-1.82399 h -50.27639 c -0.97968,0 -1.78133,0.82084 -1.78133,1.82399 v 25.47268 c 0.063,1.8482 1.77945,1.82305 1.77945,1.82305 z" sodipodi:nodetypes="csssssccccssssccc" /></g><polygon style="display:inline;fill:none" id="polygon2002" - transform="translate(-7.1960915,14.823485)" - points="807.465,560.464 807.465,828.441 0,828.441 0,560.464 " /><text + transform="translate(-7.1960915,37.823562)" + points="0,560.464 807.465,560.464 807.465,828.441 0,828.441 " /><text id="text2008" - y="505.76447" + y="528.76453" x="394.76688" style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:0%;font-family:Futura;-inkscape-font-specification:'Futura Medium';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" xml:space="preserve"><tspan style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'Sans Bold';text-align:center;text-anchor:middle" - y="505.76447" + y="528.76453" x="394.76688" id="tspan2004" sodipodi:role="line">Mixxx default keyboard mapping sheet *</tspan><tspan id="tspan2006" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'Sans Bold';text-align:center;text-anchor:middle" - y="530.76447" + y="553.76453" x="394.76688" sodipodi:role="line">www.mixxx.org</tspan></text> @@ -638,7 +633,7 @@ inkscape:tile-cx="-333.3238" style="display:inline" id="g2084" - transform="matrix(0.98440666,0,0,0.98437637,-403.55692,203.84448)" + transform="matrix(0.98440666,0,0,0.98437637,-403.55692,226.84456)" inkscape:tile-x0="-349.1963" inkscape:tile-y0="744.58046"><path inkscape:connector-curvature="0" @@ -768,7 +763,7 @@ id="stop2070" /></linearGradient><path d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" id="path2074" - style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" inkscape:connector-curvature="0" /><path inkscape:connector-curvature="0" style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#9ade00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" @@ -779,11 +774,11 @@ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#ffc022;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" inkscape:connector-curvature="0" /><path inkscape:connector-curvature="0" - style="fill:none;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:none;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" id="path2080" d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" /><path inkscape:connector-curvature="0" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;stroke:#606163;stroke-width:1.01585555;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;stroke:#606163;stroke-width:1.01586;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="path2082" d="m 29.085313,602.20245 h 25.541373 c 0.950989,0 1.729314,5e-4 1.729314,0.002 v 0.0291 c 0,9.8e-4 -0.778327,0.002 -1.729314,0.002 H 29.085313 c -0.95099,0 -1.729314,-9.9e-4 -1.729314,-0.002 v -0.0291 c 0,-9.8e-4 0.778324,-0.002 1.729314,-0.002 z" /></g><g inkscape:tile-h="31.745999" @@ -792,7 +787,7 @@ inkscape:tile-cx="-204.67022" inkscape:tile-y0="525.16238" inkscape:tile-x0="-220.54272" - transform="translate(-404.20995,227.68958)" + transform="translate(-404.20995,250.68966)" id="g2162" style="display:inline"><path d="m 27.899,586.346 h 27.959 c 1.041,0 1.893,0.852 1.893,1.893 v 27.959 c 0,1.042 -0.852,1.894 -1.893,1.894 H 27.899 c -1.041,0 -1.893,-0.852 -1.893,-1.894 v -27.959 c 0,-1.041 0.852,-1.893 1.893,-1.893 z" @@ -950,7 +945,7 @@ inkscape:tile-cx="-333.25615" style="display:inline" id="g2234" - transform="matrix(0.98440666,0,0,0.98437637,-403.55692,137.84447)" + transform="matrix(0.98440666,0,0,0.98437637,-403.55692,160.84455)" inkscape:tile-x0="-349.12865" inkscape:tile-y0="793.23404"><path inkscape:connector-curvature="0" @@ -1080,17 +1075,17 @@ id="stop2224" /></linearGradient><path d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" id="path2228" - style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" inkscape:connector-curvature="0" /><path inkscape:connector-curvature="0" style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" id="path2230" d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" /><path inkscape:connector-curvature="0" - style="fill:none;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:none;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" id="path2232" d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" /></g><g - transform="translate(-250.59346,115.02679)" + transform="translate(-250.59346,138.02687)" id="g2258"><g style="display:inline" id="use2236" @@ -1224,14 +1219,14 @@ id="stop13926" /></linearGradient><path d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" id="path13930" - style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" inkscape:connector-curvature="0" /><path inkscape:connector-curvature="0" style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#9ade00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" id="path13932" d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" /><path inkscape:connector-curvature="0" - style="fill:none;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:none;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" id="path13934" d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" /></g><g style="display:inline" @@ -1366,14 +1361,14 @@ id="stop13998" /></linearGradient><path d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" id="path14002" - style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" inkscape:connector-curvature="0" /><path inkscape:connector-curvature="0" style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#9ade00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" id="path14004" d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" /><path inkscape:connector-curvature="0" - style="fill:none;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:none;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" id="path14006" d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" /></g><g style="display:inline" @@ -1508,14 +1503,14 @@ id="stop14070" /></linearGradient><path d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" id="path14074" - style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" inkscape:connector-curvature="0" /><path inkscape:connector-curvature="0" style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#9ade00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" id="path14076" d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" /><path inkscape:connector-curvature="0" - style="fill:none;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:none;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" id="path14078" d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" /></g><g style="display:inline" @@ -1650,7 +1645,7 @@ id="stop4750" /></linearGradient><path d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" id="path4754" - style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" inkscape:connector-curvature="0" /><path inkscape:connector-curvature="0" style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#9ade00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" @@ -1661,11 +1656,11 @@ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#ffc022;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" inkscape:connector-curvature="0" /><path inkscape:connector-curvature="0" - style="fill:none;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:none;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" id="path4760" d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" /><path inkscape:connector-curvature="0" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;stroke:#606163;stroke-width:1.01585555;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;stroke:#606163;stroke-width:1.01586;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="path4762" d="m 29.085313,602.20245 h 25.541373 c 0.950989,0 1.729314,5e-4 1.729314,0.002 v 0.0291 c 0,9.8e-4 -0.778327,0.002 -1.729314,0.002 H 29.085313 c -0.95099,0 -1.729314,-9.9e-4 -1.729314,-0.002 v -0.0291 c 0,-9.8e-4 0.778324,-0.002 1.729314,-0.002 z" /></g><g style="display:inline" @@ -1800,7 +1795,7 @@ id="stop4826" /></linearGradient><path d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" id="path4830" - style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" inkscape:connector-curvature="0" /><path inkscape:connector-curvature="0" style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#9ade00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" @@ -1811,11 +1806,11 @@ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#ffc022;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" inkscape:connector-curvature="0" /><path inkscape:connector-curvature="0" - style="fill:none;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:none;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" id="path4837" d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" /><path inkscape:connector-curvature="0" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;stroke:#606163;stroke-width:1.01585555;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;stroke:#606163;stroke-width:1.01586;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="path4839" d="m 29.085313,602.20245 h 25.541373 c 0.950989,0 1.729314,5e-4 1.729314,0.002 v 0.0291 c 0,9.8e-4 -0.778327,0.002 -1.729314,0.002 H 29.085313 c -0.95099,0 -1.729314,-9.9e-4 -1.729314,-0.002 v -0.0291 c 0,-9.8e-4 0.778324,-0.002 1.729314,-0.002 z" /></g><g style="display:inline" @@ -1950,7 +1945,7 @@ id="stop4903" /></linearGradient><path d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" id="path4907" - style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" inkscape:connector-curvature="0" /><path inkscape:connector-curvature="0" style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#9ade00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" @@ -1961,11 +1956,11 @@ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#ffc022;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" inkscape:connector-curvature="0" /><path inkscape:connector-curvature="0" - style="fill:none;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:none;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" id="path4913" d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" /><path inkscape:connector-curvature="0" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;stroke:#606163;stroke-width:1.01585555;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:none;stroke:#606163;stroke-width:1.01586;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="path4915" d="m 29.085313,602.20245 h 25.541373 c 0.950989,0 1.729314,5e-4 1.729314,0.002 v 0.0291 c 0,9.8e-4 -0.778327,0.002 -1.729314,0.002 H 29.085313 c -0.95099,0 -1.729314,-9.9e-4 -1.729314,-0.002 v -0.0291 c 0,-9.8e-4 0.778324,-0.002 1.729314,-0.002 z" /></g><g style="display:inline" @@ -2100,7 +2095,7 @@ id="stop4979" /></linearGradient><path d="m 28.779736,587.34603 h 26.197528 c 0.975414,0 1.773737,0.79832 1.773737,1.77374 v 26.19753 c 0,0.97635 -0.798324,1.77467 -1.773737,1.77467 H 28.779736 c -0.975415,0 -1.773737,-0.79832 -1.773737,-1.77467 v -26.19753 c 0,-0.97542 0.798322,-1.77374 1.773737,-1.77374 z" id="path4983" - style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01585591;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#606163;stroke-width:1.01586;stroke-opacity:1" inkscape:connector-curvature="0" /><path inkscape:connector-curvature="0" style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#9ade00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" @@ -2111,11 +2106,11 @@ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#ffc022;fill-opacity:1;fill-rule:non |