From d03655eee24d504805b1173f029b63053a8d6309 Mon Sep 17 00:00:00 2001 From: John C Lemme Date: Wed, 4 Mar 2020 00:03:16 -0500 Subject: [PATCH 1/9] Tweaked the pleading face to match blob design --- svg/emoji_u1f97a.svg | 99 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/svg/emoji_u1f97a.svg b/svg/emoji_u1f97a.svg index 76ee64af4..4cfcfb02c 100644 --- a/svg/emoji_u1f97a.svg +++ b/svg/emoji_u1f97a.svg @@ -1 +1,98 @@ - \ No newline at end of file + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + From 8bcc633bfbebbbd43960db263e06ad44bc35bfae Mon Sep 17 00:00:00 2001 From: John C Lemme Date: Wed, 4 Mar 2020 11:35:06 -0500 Subject: [PATCH 2/9] Revert "Modified u263a to better match modern emoji sets" This reverts commit 8105627288069578fdf3a378b3875f5786111b56. --- svg/emoji_u263a.svg | 296 +------------------------------------------- 1 file changed, 1 insertion(+), 295 deletions(-) diff --git a/svg/emoji_u263a.svg b/svg/emoji_u263a.svg index 1ee1661d3..06d1199bf 100644 --- a/svg/emoji_u263a.svg +++ b/svg/emoji_u263a.svg @@ -1,295 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file From 35166b361685016504d5870625fe628eb7e4e34e Mon Sep 17 00:00:00 2001 From: John C Lemme Date: Wed, 4 Mar 2020 11:35:12 -0500 Subject: [PATCH 3/9] Revert "Made the exclamation emoji red, as per the standard" This reverts commit 5b0df93db6387a253cadb9682fbff210a4451f34. --- svg/emoji_u203c.svg | 70 +-------------------------------------- svg/emoji_u2049.svg | 70 +-------------------------------------- svg/emoji_u2753.svg | 79 +-------------------------------------------- svg/emoji_u2757.svg | 67 +------------------------------------- 4 files changed, 4 insertions(+), 282 deletions(-) diff --git a/svg/emoji_u203c.svg b/svg/emoji_u203c.svg index e54046a94..e84f3d47e 100644 --- a/svg/emoji_u203c.svg +++ b/svg/emoji_u203c.svg @@ -1,69 +1 @@ - - - - - - image/svg+xml - - - - - - - - !! - - +!! \ No newline at end of file diff --git a/svg/emoji_u2049.svg b/svg/emoji_u2049.svg index a29d5c95d..236b6b0d2 100644 --- a/svg/emoji_u2049.svg +++ b/svg/emoji_u2049.svg @@ -1,69 +1 @@ - - - - - - image/svg+xml - - - - - - - - !? - - +!? \ No newline at end of file diff --git a/svg/emoji_u2753.svg b/svg/emoji_u2753.svg index 3b30784ac..2956e4bdd 100644 --- a/svg/emoji_u2753.svg +++ b/svg/emoji_u2753.svg @@ -1,78 +1 @@ - - - - - - image/svg+xml - - - - - - - - - ? - - +? \ No newline at end of file diff --git a/svg/emoji_u2757.svg b/svg/emoji_u2757.svg index 340bde477..1fdd25671 100644 --- a/svg/emoji_u2757.svg +++ b/svg/emoji_u2757.svg @@ -1,66 +1 @@ - - - - - - image/svg+xml - - - - - - - - ! - - +! \ No newline at end of file From ea02f9dae6e3943ce42bc07eb6bf8b0e4655fede Mon Sep 17 00:00:00 2001 From: John C Lemme Date: Wed, 4 Mar 2020 11:35:24 -0500 Subject: [PATCH 4/9] Revert "Tweaked the puking emoji to match blob design" This reverts commit 62dedcf293613ed1f74152ebe79581039064b6cc. --- svg/emoji_u1f92e.svg | 267 +------------------------------------------ 1 file changed, 1 insertion(+), 266 deletions(-) diff --git a/svg/emoji_u1f92e.svg b/svg/emoji_u1f92e.svg index 55c45a74a..87dc9ef13 100644 --- a/svg/emoji_u1f92e.svg +++ b/svg/emoji_u1f92e.svg @@ -1,266 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file From e5fbb5e1a19e7d3922acb14bd5d5ae41e7c70df0 Mon Sep 17 00:00:00 2001 From: John C Lemme Date: Tue, 10 Mar 2020 02:06:46 -0400 Subject: [PATCH 5/9] Reduced white size in eyes --- svg/emoji_u1f97a.svg | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/svg/emoji_u1f97a.svg b/svg/emoji_u1f97a.svg index 4cfcfb02c..941bf0347 100644 --- a/svg/emoji_u1f97a.svg +++ b/svg/emoji_u1f97a.svg @@ -40,8 +40,8 @@ id="namedview24" showgrid="false" inkscape:zoom="1.84375" - inkscape:cx="-160.03692" - inkscape:cy="-7.0140738" + inkscape:cx="189.83512" + inkscape:cy="42.529025" inkscape:window-x="1134" inkscape:window-y="644" inkscape:window-maximized="1" @@ -59,40 +59,40 @@ id="path6" fill="#2f2f2f" /> - - - - - + id="g873"> + style="fill:#2f2f2f;stroke-width:0.92550111" /> + style="fill:#ffffff;stroke-width:0.86275381" /> + + + + + From 9957b24acd22ee4a037cb3d4253a3ac123373280 Mon Sep 17 00:00:00 2001 From: Michael <18199611+Code-You-Fools@users.noreply.github.com> Date: Wed, 7 Oct 2020 16:32:27 -0500 Subject: [PATCH 6/9] Fix Dockerfile Python after 3.7 removes `tp_print` from `PyTypeObject`, preventing `pyclipper` 1.1.0.post1 from compiling. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 03d9f501b..13ab60bb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:buster +FROM python:3.7 RUN apt update && apt install -y \ git \ zopfli \ From 9ac8776f448c99b4a8ca87c0d79d31e79a6f0ef9 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 7 Oct 2020 23:01:22 -0500 Subject: [PATCH 7/9] Optimize Dockerfile --- .dockerignore | 5 ++++- Dockerfile | 22 ++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.dockerignore b/.dockerignore index a1571bb83..b7007de54 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,8 @@ +Dockerfile +.dockerignore add_emoji_gsub.pyc build waveflag -.git/ \ No newline at end of file +.git/ +fonts/ diff --git a/Dockerfile b/Dockerfile index 13ab60bb7..ba054604e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,22 @@ -FROM python:3.7 -RUN apt update && apt install -y \ +FROM python:3.7-slim + +RUN apt-get update \ + && apt-get install --no-install-recommends -y \ git \ zopfli \ - libcairo2-dev + libcairo2-dev \ + make \ + imagemagick \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* -# Install nototools RUN git clone https://github.com/googlefonts/nototools.git /nototools WORKDIR /nototools -RUN pip install -r requirements.txt -RUN pip install -e . - -# Create output dir -RUN mkdir /output +RUN pip install --no-cache -r requirements.txt && pip install --no-cache -e . ADD . /blobmoji WORKDIR /blobmoji -# Build blobmoji font +RUN mkdir /output + CMD make -j $(nproc) && cp NotoColorEmoji.ttf /output/ From 16413ce465aa666bf93cdb72cd4ab3429c83bb4b Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 8 Oct 2020 11:11:10 -0500 Subject: [PATCH 8/9] Update to python:slim --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba054604e..ddc72b874 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ -FROM python:3.7-slim +FROM python:slim RUN apt-get update \ && apt-get install --no-install-recommends -y \ - git \ - zopfli \ - libcairo2-dev \ make \ + gcc \ + zopfli \ + libc-dev \ + libpng-dev \ + libcairo2-dev \ imagemagick \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN git clone https://github.com/googlefonts/nototools.git /nototools -WORKDIR /nototools -RUN pip install --no-cache -r requirements.txt && pip install --no-cache -e . +RUN pip install --no-cache notofonttools ADD . /blobmoji WORKDIR /blobmoji From 39eac539dc43caf50c806895fd2e4be2ea1e563b Mon Sep 17 00:00:00 2001 From: Constantin A <10349490+C1710@users.noreply.github.com> Date: Fri, 18 Jun 2021 14:16:40 +0200 Subject: [PATCH 9/9] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 10c155e35..e02af796f 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,8 @@ _First of all, this licensing is used for this project too to avoid any confusio _Note: On this fork you can simply send pull requests or issues. I'll try to respond as soon as possible._ +_Please try to use the discussion feature for artistic topics, like the style of the emojis. Issues are better suited for real issues, like not being able to use the font or really **missing** characters, etc._ + ## News * _2018-02-03: Blobmoji Fork created_ * 2017-09-13: Emoji redesign released.