summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-03-16 06:56:42 +0000
committerJabiertxof <jtx@jtx.marker.es>2016-03-16 06:56:42 +0000
commitf26d3e191ae2d1d1cf5b52a379a24e96afc1a518 (patch)
tree04453d4d3acefaf11069967ceec0075ce79efaf9
parentFix broken compile from branding folder (diff)
downloadinkscape-f26d3e191ae2d1d1cf5b52a379a24e96afc1a518.tar.gz
inkscape-f26d3e191ae2d1d1cf5b52a379a24e96afc1a518.zip
Updates to the branding folder. Set also OFT typos
(bzr r14711)
-rw-r--r--share/branding/CMakeLists.txt2
-rw-r--r--share/branding/EuphoriaScript-Regular.otfbin0 -> 23632 bytes
-rw-r--r--share/branding/LinLibertine_DR.otfbin0 -> 383672 bytes
-rw-r--r--share/branding/Makefile.am7
-rw-r--r--share/branding/euphoriascript-regular.ttfbin38424 -> 0 bytes
-rw-r--r--share/branding/inkscape-text.svg (renamed from share/branding/draw-freely.svg)12
6 files changed, 10 insertions, 11 deletions
diff --git a/share/branding/CMakeLists.txt b/share/branding/CMakeLists.txt
index 11f772204..0bfd54267 100644
--- a/share/branding/CMakeLists.txt
+++ b/share/branding/CMakeLists.txt
@@ -1,2 +1,2 @@
-file(GLOB _FILES "README" "*.svg" "*.ttf")
+file(GLOB _FILES "README" "*.svg" "*.oft")
install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/branding)
diff --git a/share/branding/EuphoriaScript-Regular.otf b/share/branding/EuphoriaScript-Regular.otf
new file mode 100644
index 000000000..6f475a68e
--- /dev/null
+++ b/share/branding/EuphoriaScript-Regular.otf
Binary files differ
diff --git a/share/branding/LinLibertine_DR.otf b/share/branding/LinLibertine_DR.otf
new file mode 100644
index 000000000..4ff287426
--- /dev/null
+++ b/share/branding/LinLibertine_DR.otf
Binary files differ
diff --git a/share/branding/Makefile.am b/share/branding/Makefile.am
index d47f206d6..1561dbf2c 100644
--- a/share/branding/Makefile.am
+++ b/share/branding/Makefile.am
@@ -6,10 +6,11 @@ branding_DATA = \
README \
inkscape.svg \
inkscape-flat.svg \
+ inkscape-text.svg \
sodipodi.svg \
- euphoriascript-regular.ttf \
- tux.svg \
- draw-freely.svg
+ LinLibertine_DR.otf \
+ EuphoriaScript-Regular.otf \
+ tux.svg
icons_DATA = \
inkscape.svg
diff --git a/share/branding/euphoriascript-regular.ttf b/share/branding/euphoriascript-regular.ttf
deleted file mode 100644
index 0c434cb0e..000000000
--- a/share/branding/euphoriascript-regular.ttf
+++ /dev/null
Binary files differ
diff --git a/share/branding/draw-freely.svg b/share/branding/inkscape-text.svg
index c46109386..e025b1680 100644
--- a/share/branding/draw-freely.svg
+++ b/share/branding/inkscape-text.svg
@@ -1,7 +1,7 @@
<?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:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg1725" sodipodi:version="0.32" inkscape:version="0.91+devel r14706 custom" width="210mm" height="297mm" sodipodi:docname="draw-freely.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" viewBox="0 0 793.7008 1122.52">
+<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:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg1725" sodipodi:version="0.32" inkscape:version="0.91+devel r14709" width="210mm" height="297mm" sodipodi:docname="inkscape-text.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" viewBox="0 0 793.7008 1122.52">
<defs id="defs1727">
<filter inkscape:collect="always" id="filter6017" style="color-interpolation-filters:sRGB">
<feGaussianBlur inkscape:collect="always" stdDeviation="0.80546496" id="feGaussianBlur6019" />
@@ -14,9 +14,6 @@
<stop id="stop5787" offset="0" style="stop-color:#c0cdf9;stop-opacity:1" />
<stop id="stop5789" offset="1" style="stop-color:#07092d;stop-opacity:0.28804347" />
</linearGradient>
-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath9086">
-<path inkscape:connector-curvature="0" d="M 54.1,12.5 12.9,54.7 C -2.699999,70.3 23,69 32.3,74.9 36.6,77.7 18.5,81.3 22.2,85 c 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.7 -7.3,7.6 -3.7,11.3 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.1 17,-4.1 20.3,-12.5 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 L 73,12.5 c -5.3,-5 -14,-5 -18.9,0 z m -9.9,64.7 c 0.9,0 30.8,4 19.3,7.1 -4.4,1.2 -24.6,-7.1 -19.3,-7.1 z m 57.2,16.6 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z m -69.5,11.1 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.7 -16.9,0.3 -11.1,5.2 z m 67.5,-6.7 c -4.6,4.2 0.8,8.6 5.3,5.7 1.2,-0.8 -0.1,-4.7 -5.3,-5.7 z" id="use9088" style="fill:#ffffff;fill-opacity:1" />
-</clipPath>
<filter inkscape:collect="always" id="filter8490" style="color-interpolation-filters:sRGB">
<feGaussianBlur inkscape:collect="always" stdDeviation="2.4163949" id="feGaussianBlur8492" />
</filter>
@@ -88,12 +85,12 @@
<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>
+<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
-<text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:113.254097px;line-height:100%;font-family:'Euphoria Script';-inkscape-font-specification:'Euphoria Script';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5898651px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="168.3825" y="784.553" id="text9320"><tspan sodipodi:role="line" id="tspan9318" x="168.3825" y="784.553" style="stroke-width:0.5898651px">Draw Freely</tspan></text>
-<g style="display:inline;enable-background:new" transform="matrix(3.080382,0,0,3.079418,199.7108,312.6127)" id="g9139">
+<text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:95.7550049px;line-height:100%;font-family:'Euphoria Script';-inkscape-font-specification:'Euphoria Script';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.498724px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="203.6835" y="814.5174" id="text9320"><tspan sodipodi:role="line" id="tspan9318" x="203.6835" y="814.5174" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Euphoria Script';-inkscape-font-specification:'Euphoria Script';stroke-width:0.498724px">Draw Freely</tspan></text>
+<g style="display:inline;enable-background:new" transform="matrix(3.080382,0,0,3.079418,199.7108,215.352)" id="g9139">
<g style="opacity:0.7832512" transform="translate(3.68968e-7,0.4883067)" id="g6035">
<path inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccccc" style="fill:#000000;fill-opacity:1;filter:url(#filter6017)" d="m 54.1,12.98831 -41.2,42.2 c -15.6,15.6 10.1,14.3 19.4,20.2 4.3,2.8 -13.8,6.4 -10.1,10.1 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.69999 -7.3,7.59999 -3.7,11.29999 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.09999 17,-4.1 20.3,-12.49999 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 l -42.7,-43.7 c -5.3,-5.000003 -14,-5.000003 -18.9,0 z m 47.3,81.3 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z M 31.9,105.3883 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.69999 -16.9,0.3 -11.1,5.2 z m 67.5,-6.69999 c -4.6,4.19999 0.8,8.59999 5.3,5.69999 1.2,-0.8 -0.1,-4.7 -5.3,-5.69999 z" id="path5987" />
<path inkscape:connector-curvature="0" id="path6021" d="m 54.1,13.96492 -41.2,42.2 c -15.6,15.6 10.1,14.3 19.4,20.2 4.3,2.8 -13.8,6.4 -10.1,10.1 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.69998 -7.3,7.59998 -3.7,11.29998 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.09998 17,-4.1 20.3,-12.49998 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 l -42.7,-43.7 c -5.3,-5 -14,-5 -18.9,0 z m 47.3,81.3 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z M 31.9,106.3649 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.69998 -16.9,0.3 -11.1,5.2 z m 67.5,-6.69998 c -4.6,4.19998 0.8,8.59998 5.3,5.69998 1.2,-0.8 -0.1,-4.7 -5.3,-5.69998 z" style="opacity:0.5763547;fill:#000000;fill-opacity:1;filter:url(#filter6031)" sodipodi:nodetypes="ccccccccccccccccccccccc" />
@@ -129,4 +126,5 @@
<path inkscape:connector-curvature="0" sodipodi:nodetypes="ccc" id="path5049" d="m 36.67228,76.52865 c -7.15299,4.42411 -18.27403,6.03423 -6.10383,8.97264 -1.44971,-3.2281 3.13858,-2.87202 6.10383,-8.97264 z" style="display:inline;overflow:visible;visibility:visible;opacity:0.2512315;fill:url(#linearGradient5822);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.0478933;marker:none;enable-background:accumulate" />
<path inkscape:connector-curvature="0" style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.3631579;fill:url(#linearGradient1030);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;filter:url(#filter10997-7);enable-background:accumulate" d="m 8.83428,171.6472 c 0,0 22.59178,-2.1279 27.81802,-8.6464 3.05755,-3.8136 -12.15146,-8.2638 -8.86827,-12 12.35008,-14.0541 22.73076,-13.4673 37.05025,-19.3536 14.31949,-5.8862 9.03544,-8.769 4.40381,-11.3535 -7.9325,-4.4264 -25.58722,-9.1424 -19.74696,-19.6465 5.87688,-10.56993 57.34317,-25.24999 57.34317,-25.24999 15.5962,-5.32843 13.6391,-14.96447 6,-23 L 66.83428,6.647214 c 0,0 2.28296,43.388646 -7,61.999996 -11.4715,22.99914 -72.54408,48.66179 -47,51.49999 9,1 13.32065,4.0705 17,11 7.57631,14.2688 -21,40.5 -21,40.5 z" id="path10207" sodipodi:nodetypes="csszsscccsssc" transform="matrix(0.4883067,0,0,0.4883067,57.7504,32.99748)" />
</g>
+<text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.5288191px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.9080512px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" x="115.818" y="708.1778" id="text7847"><tspan sodipodi:role="line" id="tspan7845" x="115.818" y="708.1778" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:121.0734863px;font-family:'Linux Libertine Display O';-inkscape-font-specification:'Linux Libertine Display O';stroke-width:0.9080512px">INKSCAPE</tspan></text>
</svg>