[Fontconfig] fontconfig: Branch 'master'
Behdad Esfahbod
behdad at kemper.freedesktop.org
Wed Aug 2 14:24:31 UTC 2017
conf.d/45-generic.conf | 35 ++++++
fc-lang/Makefile.am | 3
fc-lang/und_zsye.orth | 246 +++++++++++++++++++++++++++++++++++++++++++++++++
src/fclang.c | 2
4 files changed, 284 insertions(+), 2 deletions(-)
New commits:
commit 1bb8e691bd535859b1795db2554a8b1efb1d0372
Author: Akira TAGOH <akira at tagoh.org>
Date: Tue Aug 1 10:50:55 2017 +0100
Add und-zsye.orth to support emoji in lang
diff --git a/conf.d/45-generic.conf b/conf.d/45-generic.conf
index c515d7a..f7497b9 100644
--- a/conf.d/45-generic.conf
+++ b/conf.d/45-generic.conf
@@ -72,4 +72,39 @@
<default><family>math</family></default>
</alias>
+
+ <!-- add a lang for emoji if requesting emoji family -->
+ <match>
+ <test name="family">
+ <string>emoji</string>
+ </test>
+ <edit name="lang" mode="prepend">
+ <string>und-zsye</string>
+ </edit>
+ </match>
+ <!-- add a lang for math if requesting math family -->
+ <match>
+ <test name="family">
+ <string>math</string>
+ </test>
+ <edit name="lang" mode="prepend">
+ <string>und-zmth</string>
+ </edit>
+ </match>
+ <!-- prefer to use the color emoji font if none is specified -->
+ <match>
+ <test name="lang">
+ <string>und-zsye</string>
+ </test>
+ <test qual="all" name="color" compare="not_eq">
+ <bool>true</bool>
+ </test>
+ <test qual="all" name="color" compare="not_eq">
+ <bool>false</bool>
+ </test>
+ <edit name="color" mode="append">
+ <bool>true</bool>
+ </edit>
+ </match>
+
</fontconfig>
diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am
index 6f76ee0..1c886c1 100644
--- a/fc-lang/Makefile.am
+++ b/fc-lang/Makefile.am
@@ -280,7 +280,8 @@ ORTH = \
brx.orth \
sat.orth \
doi.orth \
- mni.orth
+ mni.orth \
+ und_zsye.orth
# ^-------------- Add new orth files here
-include $(top_srcdir)/git.mk
diff --git a/fc-lang/und_zsye.orth b/fc-lang/und_zsye.orth
new file mode 100644
index 0000000..7e24731
--- /dev/null
+++ b/fc-lang/und_zsye.orth
@@ -0,0 +1,246 @@
+#
+# fontconfig/fc-lang/emoji.orth
+#
+# Copyright © 2002 Keith Packard
+# Copyright © 2017 Red Hat, Inc.
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of the author(s) not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission. The authors make no
+# representations about the suitability of this software for any purpose. It
+# is provided "as is" without express or implied warranty.
+#
+# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+# Emoji
+#
+# http://unicode.org/Public/emoji/5.0/emoji-data.txt
+#
+0023 # 1.1 [1] (#️) number sign
+002A # 1.1 [1] (*️) asterisk
+0030-0039 # 1.1 [10] (0️-9️) digit zero-digit nine
+00A9 # 1.1 [1] (©️) copyright
+00AE # 1.1 [1] (®️) registered
+203C # 1.1 [1] (‼️) double exclamation mark
+2049 # 3.0 [1] (⁉️) exclamation question mark
+2122 # 1.1 [1] (™️) trade mark
+2139 # 3.0 [1] (ℹ️) information
+2194-2199 # 1.1 [6] (↔️-↙️) left-right arrow-down-left arrow
+21A9-21AA # 1.1 [2] (↩️-↪️) right arrow curving left-left arrow curving right
+231A-231B # 1.1 [2] (⌚-⌛) watch-hourglass
+2328 # 1.1 [1] (⌨️) keyboard
+23CF # 4.0 [1] (⏏️) eject button
+23E9-23F3 # 6.0 [11] (⏩-⏳) fast-forward button-hourglass with flowing sand
+# 23F8-23FA # 7.0 [3] (⏸️-⏺️) pause button-record button
+24C2 # 1.1 [1] (Ⓜ️) circled M
+25AA-25AB # 1.1 [2] (▪️-▫️) black small square-white small square
+25B6 # 1.1 [1] (▶️) play button
+25C0 # 1.1 [1] (◀️) reverse button
+25FB-25FE # 3.2 [4] (◻️-◾) white medium square-black medium-small square
+2600-2604 # 1.1 [5] (☀️-☄️) sun-comet
+260E # 1.1 [1] (☎️) telephone
+2611 # 1.1 [1] (☑️) ballot box with check
+2614-2615 # 4.0 [2] (☔-☕) umbrella with rain drops-hot beverage
+2618 # 4.1 [1] (☘️) shamrock
+261D # 1.1 [1] (☝️) index pointing up
+2620 # 1.1 [1] (☠️) skull and crossbones
+2622-2623 # 1.1 [2] (☢️-☣️) radioactive-biohazard
+2626 # 1.1 [1] (☦️) orthodox cross
+262A # 1.1 [1] (☪️) star and crescent
+262E-262F # 1.1 [2] (☮️-☯️) peace symbol-yin yang
+2638-263A # 1.1 [3] (☸️-☺️) wheel of dharma-smiling face
+2640 # 1.1 [1] (♀️) female sign
+2642 # 1.1 [1] (♂️) male sign
+2648-2653 # 1.1 [12] (♈-♓) Aries-Pisces
+2660 # 1.1 [1] (♠️) spade suit
+2663 # 1.1 [1] (♣️) club suit
+2665-2666 # 1.1 [2] (♥️-♦️) heart suit-diamond suit
+2668 # 1.1 [1] (♨️) hot springs
+267B # 3.2 [1] (♻️) recycling symbol
+267F # 4.1 [1] (♿) wheelchair symbol
+2692-2697 # 4.1 [6] (⚒️-⚗️) hammer and pick-alembic
+2699 # 4.1 [1] (⚙️) gear
+269B-269C # 4.1 [2] (⚛️-⚜️) atom symbol-fleur-de-lis
+26A0-26A1 # 4.0 [2] (⚠️-⚡) warning-high voltage
+26AA-26AB # 4.1 [2] (⚪-⚫) white circle-black circle
+26B0-26B1 # 4.1 [2] (⚰️-⚱️) coffin-funeral urn
+26BD-26BE # 5.2 [2] (⚽-⚾) soccer ball-baseball
+26C4-26C5 # 5.2 [2] (⛄-⛅) snowman without snow-sun behind cloud
+26C8 # 5.2 [1] (⛈️) cloud with lightning and rain
+26CE # 6.0 [1] (⛎) Ophiuchus
+26CF # 5.2 [1] (⛏️) pick
+26D1 # 5.2 [1] (⛑️) rescue worker’s helmet
+26D3-26D4 # 5.2 [2] (⛓️-⛔) chains-no entry
+26E9-26EA # 5.2 [2] (⛩️-⛪) shinto shrine-church
+26F0-26F5 # 5.2 [6] (⛰️-⛵) mountain-sailboat
+26F7-26FA # 5.2 [4] (⛷️-⛺) skier-tent
+26FD # 5.2 [1] (⛽) fuel pump
+2702 # 1.1 [1] (✂️) scissors
+2705 # 6.0 [1] (✅) white heavy check mark
+2708-2709 # 1.1 [2] (✈️-✉️) airplane-envelope
+270A-270B # 6.0 [2] (✊-✋) raised fist-raised hand
+270C-270D # 1.1 [2] (✌️-✍️) victory hand-writing hand
+270F # 1.1 [1] (✏️) pencil
+2712 # 1.1 [1] (✒️) black nib
+2714 # 1.1 [1] (✔️) heavy check mark
+2716 # 1.1 [1] (✖️) heavy multiplication x
+271D # 1.1 [1] (✝️) latin cross
+2721 # 1.1 [1] (✡️) star of David
+2728 # 6.0 [1] (✨) sparkles
+2733-2734 # 1.1 [2] (✳️-✴️) eight-spoked asterisk-eight-pointed star
+2744 # 1.1 [1] (❄️) snowflake
+2747 # 1.1 [1] (❇️) sparkle
+274C # 6.0 [1] (❌) cross mark
+274E # 6.0 [1] (❎) cross mark button
+2753-2755 # 6.0 [3] (❓-❕) question mark-white exclamation mark
+2757 # 5.2 [1] (❗) exclamation mark
+2763-2764 # 1.1 [2] (❣️-❤️) heavy heart exclamation-red heart
+2795-2797 # 6.0 [3] (➕-➗) heavy plus sign-heavy division sign
+27A1 # 1.1 [1] (➡️) right arrow
+27B0 # 6.0 [1] (➰) curly loop
+27BF # 6.0 [1] (➿) double curly loop
+2934-2935 # 3.2 [2] (⤴️-⤵️) right arrow curving up-right arrow curving down
+2B05-2B07 # 4.0 [3] (⬅️-⬇️) left arrow-down arrow
+2B1B-2B1C # 5.1 [2] (⬛-⬜) black large square-white large square
+2B50 # 5.1 [1] (⭐) white medium star
+2B55 # 5.2 [1] (⭕) heavy large circle
+3030 # 1.1 [1] (〰️) wavy dash
+303D # 3.2 [1] (〽️) part alternation mark
+3297 # 1.1 [1] (㊗️) Japanese “congratulations” button
+3299 # 1.1 [1] (㊙️) Japanese “secret” button
+1F004 # 5.1 [1] (🀄) mahjong red dragon
+1F0CF # 6.0 [1] (🃏) joker
+1F170-1F171 # 6.0 [2] (🅰️-🅱️) A button (blood type)-B button (blood type)
+1F17E # 6.0 [1] (🅾️) O button (blood type)
+1F17F # 5.2 [1] (🅿️) P button
+1F18E # 6.0 [1] (🆎) AB button (blood type)
+1F191-1F19A # 6.0 [10] (🆑-🆚) CL button-VS button
+1F1E6-1F1FF # 6.0 [26] (🇦-🇿) regional indicator symbol letter a-regional indicator symbol letter z
+1F201-1F202 # 6.0 [2] (🈁-🈂️) Japanese “here” button-Japanese “service charge” button
+1F21A # 5.2 [1] (🈚) Japanese “free of charge” button
+1F22F # 5.2 [1] (🈯) Japanese “reserved” button
+1F232-1F23A # 6.0 [9] (🈲-🈺) Japanese “prohibited” button-Japanese “open for business” button
+1F250-1F251 # 6.0 [2] (🉐-🉑) Japanese “bargain” button-Japanese “acceptable” button
+1F300-1F320 # 6.0 [33] (🌀-🌠) cyclone-shooting star
+# 1F321 # 7.0 [1] (🌡️) thermometer
+# 1F324-1F32C # 7.0 [9] (🌤️-🌬️) sun behind small cloud-wind face
+# 1F32D-1F32F # 8.0 [3] (🌭-🌯) hot dog-burrito
+1F330-1F335 # 6.0 [6] (🌰-🌵) chestnut-cactus
+# 1F336 # 7.0 [1] (🌶️) hot pepper
+1F337-1F37C # 6.0 [70] (🌷-🍼) tulip-baby bottle
+# 1F37D # 7.0 [1] (🍽️) fork and knife with plate
+# 1F37E-1F37F # 8.0 [2] (🍾-🍿) bottle with popping cork-popcorn
+1F380-1F393 # 6.0 [20] (🎀-🎓) ribbon-graduation cap
+# 1F396-1F397 # 7.0 [2] (🎖️-🎗️) military medal-reminder ribbon
+# 1F399-1F39B # 7.0 [3] (🎙️-🎛️) studio microphone-control knobs
+# 1F39E-1F39F # 7.0 [2] (🎞️-🎟️) film frames-admission tickets
+1F3A0-1F3C4 # 6.0 [37] (🎠-🏄) carousel horse-person surfing
+# 1F3C5 # 7.0 [1] (🏅) sports medal
+1F3C6-1F3CA # 6.0 [5] (🏆-🏊) trophy-person swimming
+# 1F3CB-1F3CE # 7.0 [4] (🏋️-🏎️) person lifting weights-racing car
+# 1F3CF-1F3D3 # 8.0 [5] (🏏-🏓) cricket-ping pong
+# 1F3D4-1F3DF # 7.0 [12] (🏔️-🏟️) snow-capped mountain-stadium
+1F3E0-1F3F0 # 6.0 [17] (🏠-🏰) house-castle
+# 1F3F3-1F3F5 # 7.0 [3] (🏳️-🏵️) white flag-rosette
+# 1F3F7 # 7.0 [1] (🏷️) label
+# 1F3F8-1F3FF # 8.0 [8] (🏸-🏿) badminton-dark skin tone
+1F400-1F43E # 6.0 [63] (🐀-🐾) rat-paw prints
+# 1F43F # 7.0 [1] (🐿️) chipmunk
+1F440 # 6.0 [1] (👀) eyes
+# 1F441 # 7.0 [1] (👁️) eye
+1F442-1F4F7 # 6.0[182] (👂-📷) ear-camera
+# 1F4F8 # 7.0 [1] (📸) camera with flash
+1F4F9-1F4FC # 6.0 [4] (📹-📼) video camera-videocassette
+# 1F4FD # 7.0 [1] (📽️) film projector
+# 1F4FF # 8.0 [1] (📿) prayer beads
+1F500-1F53D # 6.0 [62] (🔀-🔽) shuffle tracks button-down button
+# 1F549-1F54A # 7.0 [2] (🕉️-🕊️) om-dove
+# 1F54B-1F54E # 8.0 [4] (🕋-🕎) kaaba-menorah
+1F550-1F567 # 6.0 [24] (🕐-🕧) one o’clock-twelve-thirty
+# 1F56F-1F570 # 7.0 [2] (🕯️-🕰️) candle-mantelpiece clock
+# 1F573-1F579 # 7.0 [7] (🕳️-🕹️) hole-joystick
+# 1F57A # 9.0 [1] (🕺) man dancing
+# 1F587 # 7.0 [1] (🖇️) linked paperclips
+# 1F58A-1F58D # 7.0 [4] (🖊️-🖍️) pen-crayon
+# 1F590 # 7.0 [1] (🖐️) raised hand with fingers splayed
+# 1F595-1F596 # 7.0 [2] (🖕-🖖) middle finger-vulcan salute
+# 1F5A4 # 9.0 [1] (🖤) black heart
+# 1F5A5 # 7.0 [1] (🖥️) desktop computer
+# 1F5A8 # 7.0 [1] (🖨️) printer
+# 1F5B1-1F5B2 # 7.0 [2] (🖱️-🖲️) computer mouse-trackball
+# 1F5BC # 7.0 [1] (🖼️) framed picture
+# 1F5C2-1F5C4 # 7.0 [3] (🗂️-🗄️) card index dividers-file cabinet
+# 1F5D1-1F5D3 # 7.0 [3] (🗑️-🗓️) wastebasket-spiral calendar
+# 1F5DC-1F5DE # 7.0 [3] (🗜️-🗞️) clamp-rolled-up newspaper
+# 1F5E1 # 7.0 [1] (🗡️) dagger
+# 1F5E3 # 7.0 [1] (🗣️) speaking head
+# 1F5E8 # 7.0 [1] (🗨️) left speech bubble
+# 1F5EF # 7.0 [1] (🗯️) right anger bubble
+# 1F5F3 # 7.0 [1] (🗳️) ballot box with ballot
+# 1F5FA # 7.0 [1] (🗺️) world map
+1F5FB-1F5FF # 6.0 [5] (🗻-🗿) mount fuji-moai
+# 1F600 # 6.1 [1] (😀) grinning face
+1F601-1F610 # 6.0 [16] (😁-😐) grinning face with smiling eyes-neutral face
+# 1F611 # 6.1 [1] (😑) expressionless face
+1F612-1F614 # 6.0 [3] (😒-😔) unamused face-pensive face
+# 1F615 # 6.1 [1] (😕) confused face
+1F616 # 6.0 [1] (😖) confounded face
+# 1F617 # 6.1 [1] (😗) kissing face
+1F618 # 6.0 [1] (😘) face blowing a kiss
+# 1F619 # 6.1 [1] (😙) kissing face with smiling eyes
+1F61A # 6.0 [1] (😚) kissing face with closed eyes
+# 1F61B # 6.1 [1] (😛) face with stuck-out tongue
+1F61C-1F61E # 6.0 [3] (😜-😞) face with stuck-out tongue & winking eye-disappointed face
+# 1F61F # 6.1 [1] (😟) worried face
+1F620-1F625 # 6.0 [6] (😠-😥) angry face-disappointed but relieved face
+# 1F626-1F627 # 6.1 [2] (😦-😧) frowning face with open mouth-anguished face
+1F628-1F62B # 6.0 [4] (😨-😫) fearful face-tired face
+# 1F62C # 6.1 [1] (😬) grimacing face
+1F62D # 6.0 [1] (😭) loudly crying face
+# 1F62E-1F62F # 6.1 [2] (😮-😯) face with open mouth-hushed face
+1F630-1F633 # 6.0 [4] (😰-😳) face with open mouth & cold sweat-flushed face
+# 1F634 # 6.1 [1] (😴) sleeping face
+1F635-1F640 # 6.0 [12] (😵-🙀) dizzy face-weary cat face
+# 1F641-1F642 # 7.0 [2] (🙁-🙂) slightly frowning face-slightly smiling face
+# 1F643-1F644 # 8.0 [2] (🙃-🙄) upside-down face-face with rolling eyes
+1F645-1F64F # 6.0 [11] (🙅-🙏) person gesturing NO-folded hands
+1F680-1F6C5 # 6.0 [70] (🚀-🛅) rocket-left luggage
+# 1F6CB-1F6CF # 7.0 [5] (🛋️-🛏️) couch and lamp-bed
+# 1F6D0 # 8.0 [1] (🛐) place of worship
+# 1F6D1-1F6D2 # 9.0 [2] (🛑-🛒) stop sign-shopping cart
+# 1F6E0-1F6E5 # 7.0 [6] (🛠️-🛥️) hammer and wrench-motor boat
+# 1F6E9 # 7.0 [1] (🛩️) small airplane
+# 1F6EB-1F6EC # 7.0 [2] (🛫-🛬) airplane departure-airplane arrival
+# 1F6F0 # 7.0 [1] (🛰️) satellite
+# 1F6F3 # 7.0 [1] (🛳️) passenger ship
+# 1F6F4-1F6F6 # 9.0 [3] (🛴-🛶) kick scooter-canoe
+# 1F6F7-1F6F8 # 10.0 [2] (🛷-🛸) sled-flying saucer
+# 1F910-1F918 # 8.0 [9] (🤐-🤘) zipper-mouth face-sign of the horns
+# 1F919-1F91E # 9.0 [6] (🤙-🤞) call me hand-crossed fingers
+# 1F91F # 10.0 [1] (🤟) love-you gesture
+# 1F920-1F927 # 9.0 [8] (🤠-🤧) cowboy hat face-sneezing face
+# 1F928-1F92F # 10.0 [8] (🤨-🤯) face with raised eyebrow-exploding head
+# 1F930 # 9.0 [1] (🤰) pregnant woman
+# 1F931-1F932 # 10.0 [2] (🤱-🤲) breast-feeding-palms up together
+# 1F933-1F93A # 9.0 [8] (🤳-🤺) selfie-person fencing
+# 1F93C-1F93E # 9.0 [3] (🤼-🤾) people wrestling-person playing handball
+# 1F940-1F945 # 9.0 [6] (🥀-🥅) wilted flower-goal net
+# 1F947-1F94B # 9.0 [5] (🥇-🥋) 1st place medal-martial arts uniform
+# 1F94C # 10.0 [1] (🥌) curling stone
+# 1F950-1F95E # 9.0 [15] (🥐-🥞) croissant-pancakes
+# 1F95F-1F96B # 10.0 [13] (🥟-🥫) dumpling-canned food
+# 1F980-1F984 # 8.0 [5] (🦀-🦄) crab-unicorn face
+# 1F985-1F991 # 9.0 [13] (🦅-🦑) eagle-squid
+# # 1F992-1F997 # 10.0 [6] (🦒-🦗) giraffe-cricket
+# 1F9C0 # 8.0 [1] (🧀) cheese wedge
+# 1F9D0-1F9E6 # 10.0 [23] (🧐-🧦) face with monocle-socks
diff --git a/src/fclang.c b/src/fclang.c
index 6da82dd..8418b46 100644
--- a/src/fclang.c
+++ b/src/fclang.c
@@ -28,7 +28,7 @@
/* Objects MT-safe for readonly access. */
typedef struct {
- const FcChar8 lang[8];
+ const FcChar8 lang[16];
const FcCharSet charset;
} FcLangCharSet;
More information about the Fontconfig
mailing list