ucharclasses (11aug17)

git-svn-id: svn://tug.org/texlive/trunk@45024 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 235 insertions, 88 deletions

diff --git a/Master/texmf-dist/doc/xelatex/ucharclasses/README b/Master/texmf-dist/doc/xelatex/ucharclasses/README
index 6926db23fee..1e5d7c74f1d 100644
--- a/Master/texmf-dist/doc/xelatex/ucharclasses/README
+++ b/Master/texmf-dist/doc/xelatex/ucharclasses/README
@@ -1,3 +1,11 @@
+===========================================================
+=
+=         THIS PACKAGE IS IN NEED OF A MAINTAINER         =
+=   SEE https://github.com/Pomax/ucharclasses/issues/23   =
+=
+===========================================================
+
+
               ucharclasses package for XeLaTex
               --------------------------------
               Michiel Kamermans, October 2011
@@ -51,10 +59,11 @@ Unicode Compatibility
 ---------------------
 
  Current compatibility is Unicode 8.0
- 
+
 Changelog
 ---------
 
+ v2.3: Unicode 10 support
  v2.2: Unicode 8.0 and LaTeX2e support
  v2.1: Uplift for the updates introduced in XeTeX 0.99994
  v2.0: Rewritten to Vastly improve performance + Unicode 6.0
@@ -63,7 +72,7 @@ Changelog
 Contributors
 ------------
 
- v2.1-2.2: Qing Lee, Werner Lemberg
+ v2.1-2.3: Qing Lee, Werner Lemberg
  v2.0: Enrico Gregorio
  v1.0: Mike "Pomax" Kamermans
 
@@ -71,7 +80,7 @@ License?
 --------
 
  Public Domain
- http://www.tex.ac.uk/CTAN/help/Catalogue/licenses.pd.html
+ https://www.ctan.org/license/pd
 
 Repository?
 -----------
diff --git a/Master/texmf-dist/doc/xelatex/ucharclasses/ucharclasses.pdf b/Master/texmf-dist/doc/xelatex/ucharclasses/ucharclasses.pdf
index 346fec335d0..725ea3e9b1f 100644
--- a/Master/texmf-dist/doc/xelatex/ucharclasses/ucharclasses.pdf
+++ b/Master/texmf-dist/doc/xelatex/ucharclasses/ucharclasses.pdf
diff --git a/Master/texmf-dist/doc/xelatex/ucharclasses/ucharclasses.tex b/Master/texmf-dist/doc/xelatex/ucharclasses/ucharclasses.tex
index 3622dc8a5df..fc7862d6a5c 100644
--- a/Master/texmf-dist/doc/xelatex/ucharclasses/ucharclasses.tex
+++ b/Master/texmf-dist/doc/xelatex/ucharclasses/ucharclasses.tex
@@ -1,4 +1,5 @@
-\documentclass{article}
+\documentclass{article}
+\usepackage[margin={4cm,4cm}]{geometry}
 \usepackage{tocloft}
 \usepackage[pdfborder=0]{hyperref}
 \usepackage{multicol}
@@ -30,16 +31,16 @@
   \end{enumerate}}
 
 \usepackage{fontspec}
-\newfontfamily{\defaultfont}{Code2000}
-\newfontfamily{\latinfont}{Palatino Linotype}
-\newfontfamily{\cjkfont}{HAN NOM A}
-\newfontfamily{\japanesefont}{Ume Mincho}
-\newfontfamily{\unifiedCJKfont}{SimSun-ExtB}
-\newfontfamily{\thaifont}{IrisUPC}
-\newfontfamily{\sinhalafont}{Iskoola Pota}
-\newfontfamily{\malayalamfont}{Arial Unicode MS}
-\newfontfamily{\dominofont}{FreeSerif}
-\newfontfamily{\mahjongfont}{FreeSerif}
+\newfontfamily{\defaultfont}[Path=fonts/]{CODE2000.TTF}
+\newfontfamily{\latinfont}[Path=fonts/]{pala.ttf}
+\newfontfamily{\cjkfont}[Path=fonts/]{HAN_NOM_A.ttf}
+\newfontfamily{\japanesefont}[Path=fonts/]{ume-tms3.ttf}
+\newfontfamily{\unifiedCJKfont}[Path=fonts/]{simsunb.ttf}
+\newfontfamily{\thaifont}[Path=fonts/]{upcil.ttf}
+\newfontfamily{\sinhalafont}[Path=fonts/]{iskpota.ttf}
+\newfontfamily{\malayalamfont}[Path=fonts/]{arialuni.ttf}
+\newfontfamily{\dominofont}[Path=fonts/]{seguisym.ttf}
+\newfontfamily{\mahjongfont}[Path=fonts/]{seguiemj.ttf}
 
 % and the font switching magic
 \usepackage[CJK, Latin, Thai, Sinhala, Malayalam, DominoTiles, MahjongTiles]{ucharclasses}
@@ -85,7 +86,7 @@
 			\item Thai: คุณพูดภาษาอังกฤษได้ไหม (using IrisUPC)
 			\item Sinhala: කරැණාකරල ඒක නැවත කියන්න පුළුවන්ද (using Iskoola Pota)
 			\item Malayalam: നിങ്ങളുടെ പേരെന്താണ്? (using Arial Unicode MS)
-			\item and even domino tiles, 🁇 🀼 🁐 🁋 🁚 🁝, and mahjong tiles: 🀑 🀑 🀑 🀒 🀒 🀒 🀕 🀕 🀕 🀗 🀗 🀗 🀅 🀅 (using FreeFont)
+			\item and even domino tiles, 🁇 🀼 🁐 🁋 🁚 🁝 (using Segoe UI Symbol) and mahjong tiles: 🀑 🀑 🀑 🀒 🀒 🀒 🀕 🀕 🀕 🀗 🀗 🀗 🀅 🀅 (using Segoe UI Emoji)
 		\end{itemlist}
 
 		However, be aware that this only “just works” for Unicode blocks. If you are working with typographically overlapping languages, such as combining English and Vietnamese in one document, things get a lot more complex if you want one font for English and another for Vietnamese. Both of these languagese use Latin blocks, so it is inherently impossible to tell which language is intended based on which Unicode block a character in a word belongs to.
@@ -96,7 +97,7 @@
 			\item Chinese, using the Japanese CJK font, which may have gaps: 我的母语是汉语 (uses Ume Mincho, which does not contain the three Chinese-specific characters used in that phrase)
     \end{itemlist}
 
-  We can get around this by explicitly setting the font to one that supports Chinese, turning off the switching rules for the stretch of Chinese text, using \{\textbackslash uccoff + a fontspec rule + the text we wanted to typeset + \textbackslash uccon\}. This gives us: {\uccoff \fontspec{HAN NOM A} 我的母语是汉语 \uccon} (This now explicitly uses Han Nom A).
+  We can get around this by explicitly setting the font to one that supports Chinese, turning off the switching rules for the stretch of Chinese text, using \{\textbackslash uccoff + a fontspec rule + the text we wanted to typeset + \textbackslash uccon\}. This gives us: {\uccoff \fontspec[Path=fonts/]{HAN_NOM_A.ttf} 我的母语是汉语 \uccon} (This now explicitly uses Han Nom A).
 
 	\section{Use}
 
@@ -114,8 +115,8 @@
 				\newfontfamily{\thaifont}{IrisUPC}
 				\newfontfamily{\sinhalafont}{Iskoola Pota}
 				\newfontfamily{\malayalamfont}{Arial Unicode MS}
-				\newfontfamily{\dominofont}{FreeSerif}
-				\newfontfamily{\mahjongfont}{FreeSerif}
+				\newfontfamily{\dominofont}{Segoe UI Symbol}
+				\newfontfamily{\mahjongfont}{Segoe UI Emoji}
 
 				\usepackage[CJK, Latin, Thai, Sinhala, Malayalam,
 				            DominoTiles, MahjongTiles]{ucharclasses}
@@ -160,6 +161,7 @@
 
 		If you need script support, rather than Unicode blocks, you may want to have a look at the polyglossia package instead. You can try to combine the two packages by relying on \textbackslash uccoff and textbackslash uccon to turn off Unicode block transitions inside regions of text, but this may not always work, or may have interesting interaction side-effects.
 
+	\pagebreak
 	\section{Commands}
 
 		\subsection{\textbackslash setTransitionTo[2]}
@@ -196,18 +198,26 @@
 
 			\begin{itemlist}
 				\item Arabics
+				\item CanadianSyllabics
+				\item CherokeeFull
 				\item Chinese
 				\item CJK
 				\item Cyrillics
 				\item Diacritics
+				\item EthiopicFull
+				\item GeorgianFull
 				\item Greek
 				\item Korean
 				\item Japanese
 				\item Latin
 				\item Mathematics
+				\item MongolianFull
+				\item MyanmarFull
 				\item Phonetics
 				\item Punctuation
+				\item SundaneseFull
 				\item Symbols
+				\item SyriacFull
 				\item Yi
 			\end{itemlist}
 
@@ -227,12 +237,11 @@
 				\item The code you want used when exiting any Unicode block
 			\end{numberlist}
 
+	\pagebreak
 	\section{Code}
 
 		The code relies on running through individual definition blocks for each Unicode blocks, conditioned to whether ucharclasses is loaded with package options or not:
 
-		\pagebreak
-
 		\disableTransitionRules
 		\begin{verbatim}
 	  ...
@@ -359,19 +368,21 @@
 		\end{verbatim}
 		\enableTransitionRules
 
+	\pagebreak
 	\section{Package options and Unicode blocks}
 
-		The following Unicode blocks are available for use in transition rules (corresponding to Unicode version 8.0), as well as for use as package options when you want ucharclasses to only load those classes that you know are used in your document.
+		The following Unicode blocks are available for use in transition rules (corresponding to Unicode version 10.0), as well as for use as package options when you want ucharclasses to only load those classes that you know are used in your document.
 
 		Starting with XeTeX version 0.99994, the number of \textbackslash XeTeXcharclass registers was extended from 256 to 4096; some not so important blocks are thus provided only for this and newer versions; in the list below, those blocks are put into parentheses.
 
-		\begin{multicols}{2}
+		\begin{multicols*}{2}
 			\begin{itemlist}
+				\item (Adlam)
 				\item AegeanNumbers
 				\item Ahom
 				\item AlchemicalSymbols
 				\item AlphabeticPresentationForms
-				\item AnatolianHieroglyphs
+				\item (AnatolianHieroglyphs)
 				\item AncientGreekMusicalNotation
 				\item AncientGreekNumbers
 				\item AncientSymbols
@@ -391,6 +402,7 @@
 				\item BassaVah
 				\item Batak
 				\item Bengali
+				\item (Bhaiksuki)
 				\item BlockElements
 				\item Bopomofo
 				\item BopomofoExtended
@@ -400,7 +412,7 @@
 				\item Buginese
 				\item Buhid
 				\item ByzantineMusicalSymbols
-				\item Carian
+				\item (Carian)
 				\item CaucasianAlbanian
 				\item Chakma
 				\item Cham
@@ -419,6 +431,7 @@
 				\item CJKUnifiedIdeographsExtensionC
 				\item CJKUnifiedIdeographsExtensionD
 				\item CJKUnifiedIdeographsExtensionE
+				\item CJKUnifiedIdeographsExtensionF
 				\item CombiningDiacriticalMarks
 				\item CombiningDiacriticalMarksExtended
 				\item CombiningDiacriticalMarksForSymbols
@@ -436,6 +449,7 @@
 				\item Cyrillic
 				\item CyrillicExtendedA
 				\item CyrillicExtendedB
+				\item CyrillicExtendedC
 				\item CyrillicSupplement
 				\item Deseret
 				\item Devanagari
@@ -461,6 +475,7 @@
 				\item Georgian
 				\item GeorgianSupplement
 				\item Glagolitic
+				\item GlagoliticSupplement
 				\item Gothic
 				\item Grantha
 				\item GreekAndCoptic
@@ -478,12 +493,14 @@
 				\item Hebrew
 				\item Hiragana
 				\item IdeographicDescriptionCharacters
+				\item IdeographicSymbolsAndPunctuation
 				\item ImperialAramaic
 				\item InscriptionalPahlavi
 				\item InscriptionalParthian
 				\item IPAExtensions
 				\item Javanese
 				\item Kaithi
+				\item KanaExtendedA
 				\item KanaSupplement
 				\item Kanbun
 				\item KangxiRadicals
@@ -518,6 +535,8 @@
 				\item Malayalam
 				\item Mandaic
 				\item Manichaean
+				\item (Marchen)
+				\item (MasaramGondi)
 				\item MathematicalAlphanumericSymbols
 				\item MathematicalOperators
 				\item MeeteiMayek
@@ -535,6 +554,7 @@
 				\item Modi
 				\item ModifierToneLetters
 				\item Mongolian
+				\item MongolianSupplement
 				\item Mro
 				\item Multani
 				\item MusicalSymbols
@@ -542,27 +562,30 @@
 				\item MyanmarExtendedA
 				\item MyanmarExtendedB
 				\item Nabataean
+				\item (Newa)
 				\item NewTaiLue
 				\item NKo
 				\item NumberForms
+				\item (Nushu)
 				\item Ogham
 				\item OlChiki
 				\item OldHungarian
-				\item OldItalic
-				\item OldNorthArabian
+				\item (OldItalic)
+				\item (OldNorthArabian)
 				\item OldPermic
 				\item OldPersian
-				\item OldSouthArabian
-				\item OldTurkic
+				\item (OldSouthArabian)
+				\item (OldTurkic)
 				\item OpticalCharacterRecognition
 				\item Oriya
 				\item OrnamentalDingbats
+				\item (Osage)
 				\item Osmanya
 				\item PahawhHmong
 				\item Palmyrene
 				\item PauCinHau
 				\item PhagsPa
-				\item PhaistosDisc
+				\item (PhaistosDisc)
 				\item Phoenician
 				\item PhoneticExtensions
 				\item PhoneticExtensionsSupplement
@@ -582,6 +605,7 @@
 				\item SinhalaArchaicNumbers
 				\item SmallFormVariants
 				\item SoraSompeng
+				\item (Soyombo)
 				\item SpacingModifierLetters
 				\item Sundanese
 				\item SundaneseSupplement
@@ -597,6 +621,7 @@
 				\item (SuttonSignWriting)
 				\item SylotiNagri
 				\item Syriac
+				\item SyriacSupplement
 				\item Tagalog
 				\item Tagbanwa
 				\item Tags
@@ -606,6 +631,8 @@
 				\item TaiXuanJingSymbols
 				\item Takri
 				\item Tamil
+				\item (Tangut)
+				\item (TangutComponents)
 				\item Telugu
 				\item Thaana
 				\item Thai
@@ -623,26 +650,37 @@
 				\item YiRadicals
 				\item YiSyllables
 				\item YijingHexagramSymbols
+				\item (ZanabazarSquare)
 			\end{itemlist}
-		\end{multicols}
+		\end{multicols*}
 
 		In addition, the informal blocks for use as package option are:
 
-		\begin{itemlist}
-			\item Arabics
-			\item Chinese
-			\item CJK
-			\item Cyrillics
-			\item Diacritics
-			\item Greek
-			\item Korean
-			\item Japanese
-			\item Latin
-			\item Mathematics
-			\item Phonetics
-			\item Punctuation
-			\item Symbols
-			\item Yi
-		\end{itemlist}
+		\begin{multicols*}{2}
+			\begin{itemlist}
+				\item Arabics
+				\item CanadianSyllabics
+				\item CherokeeFull
+				\item Chinese
+				\item CJK
+				\item Cyrillics
+				\item Diacritics
+				\item EthiopicFull
+				\item GeorgianFull
+				\item Greek
+				\item Korean
+				\item Japanese
+				\item Latin
+				\item Mathematics
+				\item MongolianFull
+				\item MyanmarFull
+				\item Phonetics
+				\item Punctuation
+				\item SundaneseFull
+				\item Symbols
+				\item SyriacFull
+				\item Yi
+			\end{itemlist}
+		\end{multicols*}
 
 \end{document}
diff --git a/Master/texmf-dist/tex/xelatex/ucharclasses/ucharclasses.sty b/Master/texmf-dist/tex/xelatex/ucharclasses/ucharclasses.sty
index a82226cdc4d..afa8aa2bf65 100644
--- a/Master/texmf-dist/tex/xelatex/ucharclasses/ucharclasses.sty
+++ b/Master/texmf-dist/tex/xelatex/ucharclasses/ucharclasses.sty
@@ -5,24 +5,25 @@
 %  automatically when a transition from a character from one unicode block to a
 %  character from another unicode block is encountered by XeTeX
 %
-%  Current compatibility should be Unicode 8.0.
+%  Current compatibility should be Unicode 10.0.
 %
 %  Credits:
-%   v2.1-2.2: Qing Lee, Werner Lemberg
+%   v2.1-2.3: Qing Lee, Werner Lemberg
 %   v2.0: Enrico Gregorio
 %   v1.0: Mike "Pomax" Kamermans
 %
 %  Significant updates:
+%   v2.3: Unicode 10 support
 %   v2.2: Unicode 8.0 and LaTeX2e support
 %   v2.1: Uplift for the intercharclass updates introduced in XeTeX 0.99994
 %   v2.0: Rewritten to Vastly improve performance.
 %   v1.0: Unicode block switching using XeTeX intercharclasses.
 %
-%  License: public domain (http://www.tex.ac.uk/CTAN/help/Catalogue/licenses.pd.html)
+%  License: public domain (https://www.ctan.org/license/pd)
 %
 % ----------------------------------------------------------------------------
 
-\ProvidesPackage{ucharclasses}[2016/04/25 v2.2.1 Unicode block character classes for XeLaTeX]
+\ProvidesPackage{ucharclasses}[2017/08/10 v2.3.0 Unicode block character classes for XeLaTeX]
 
 \newif\if@ucharclassverbose
 \DeclareOption{verbose}{\@ucharclassverbosetrue}
@@ -80,7 +81,7 @@
   \do{Buginese}{"01A00}{"01A1F}
   \do{Buhid}{"01740}{"0175F}
   \do{ByzantineMusicalSymbols}{"01D000}{"01D0FF}
-  \do{Carian}{"0102A0}{"0102DF}
+%     Carian (see below)
   \do{Cham}{"0AA00}{"0AA5F}
   \do{Cherokee}{"013A0}{"013FF}
   \do{CJKCompatibility}{"03300}{"033FF}
@@ -177,13 +178,13 @@
   \do{NumberForms}{"02150}{"0218F}
   \do{Ogham}{"01680}{"0169F}
   \do{OlChiki}{"01C50}{"01C7F}
-  \do{OldItalic}{"010300}{"01032F}
+%     OldItalic (see below)
   \do{OldPersian}{"0103A0}{"0103DF}
   \do{OpticalCharacterRecognition}{"02440}{"0245F}
   \do{Oriya}{"0B00}{"0B7F}
   \do{Osmanya}{"010480}{"0104AF}
   \do{PhagsPa}{"0A840}{"0A87F}
-  \do{PhaistosDisc}{"0101D0}{"0101FF}
+%     PhaistosDisc (see below)
   \do{Phoenician}{"010900}{"01091F}
   \do{PhoneticExtensions}{"01D00}{"01D7F}
   \do{PhoneticExtensionsSupplement}{"01D80}{"01DBF}
@@ -242,8 +243,8 @@
   \do{Lisu}{"0A4D0}{"0A4FF}
   \do{MeeteiMayek}{"0ABC0}{"0ABFF}
   \do{MyanmarExtendedA}{"0AA60}{"0AA7F}
-  \do{OldSouthArabian}{"010A60}{"010A7F}
-  \do{OldTurkic}{"010C00}{"010C4F}
+%     OldSouthArabian (see below)
+%     OldTurkic (see below)
   \do{RumiNumeralSymbols}{"010E60}{"010E7F}
   \do{Samaritan}{"0800}{"083F}
   \do{TaiTham}{"01A20}{"01AAF}
@@ -295,7 +296,7 @@
   \do{Mro}{"016A40}{"016A6F}
   \do{MyanmarExtendedB}{"0A9E0}{"0A9FF}
   \do{Nabataean}{"010880}{"0108AF}
-  \do{OldNorthArabian}{"010A80}{"010A9F}
+%     OldNorthArabian (see below)
   \do{OldPermic}{"010350}{"01037F}
   \do{OrnamentalDingbats}{"01F650}{"01F67F}
   \do{PahawhHmong}{"016B00}{"016B8F}
@@ -310,7 +311,7 @@
   \do{WarangCiti}{"0118A0}{"0118FF}
 % Unicode 8.0 additions
   \do{Ahom}{"011700}{"01173F}
-  \do{AnatolianHieroglyphs}{"014400}{"01467F}
+%     AnatolianHieroglyphs (see below)
   \do{CherokeeSupplement}{"0AB70}{"0ABBF}
   \do{CJKUnifiedIdeographsExtensionE}{"02B820}{"02CEAF}
   \do{EarlyDynasticCuneiform}{"012480}{"01254F}
@@ -319,15 +320,45 @@
   \do{OldHungarian}{"010C80}{"010CFF}
   \do{SupplementalSymbolsAndPictographs}{"01F900}{"01F9FF}
 %     SuttonSignWriting (see below)
+% Unicode 9.0 additions needed for classes
+  \do{CyrillicExtendedC}{"01C80}{"01C8F}
+  \do{GlagoliticSupplement}{"01E000}{"01E02F}
+  \do{IdeographicSymbolsAndPunctuation}{"016FE0}{"016FFF}
+  \do{MongolianSupplement}{"011660}{"01167F}
+% Unicode 10.0 additions needed for classes
+  \do{CJKUnifiedIdeographsExtensionF}{"02CEB0}{"02EBEF}
+  \do{KanaExtendedA}{"01B100}{"01B12F}
+  \do{SyriacSupplement}{"0860}{"086F}
 %
   \ifdefined\XeTeXinterwordspaceshaping
-    \do{SupplementaryPrivateUseAreaA}{"0F0000}{"0FFFFF}
-    \do{SupplementaryPrivateUseAreaB}{"0100000}{"010FFFF}
+    \do{AnatolianHieroglyphs}{"014400}{"01467F}
+    \do{Carian}{"0102A0}{"0102DF}
     \do{Duployan}{"01BC00}{"01BC9F}
+    \do{OldItalic}{"010300}{"01032F}
+    \do{OldNorthArabian}{"010A80}{"010A9F}
+    \do{OldSouthArabian}{"010A60}{"010A7F}
+    \do{OldTurkic}{"010C00}{"010C4F}
+    \do{PhaistosDisc}{"0101D0}{"0101FF}
     \do{ShorthandFormatControls}{"01BCA0}{"01BCAF}
+    \do{SupplementaryPrivateUseAreaA}{"0F0000}{"0FFFFF}
+    \do{SupplementaryPrivateUseAreaB}{"0100000}{"010FFFF}
     \do{SuttonSignWriting}{"01D800}{"01DAAF}
+%   Unicode 9.0 additions
+    \do{Adlam}{"01E900}{"01E95F}
+    \do{Bhaiksuki}{"011C00}{"011C6F}
+    \do{Marchen}{"011C70}{"011CBF}
+    \do{Newa}{"011400}{"01147F}
+    \do{Osage}{"0104B0}{"0104FF}
+    \do{Tangut}{"017000}{"0187FF}
+    \do{TangutComponents}{"018800}{"018AFF}
+%   Unicode 10.0 additions
+    \do{MasaramGondi}{"011D00}{"011D5F}
+    \do{Nushu}{"01B170}{"01B2FF}
+    \do{Soyombo}{"011A50}{"011AAF}
+    \do{ZanabazarSquare}{"011A00}{"011A4F}
   \fi
 }
+
 % ----------------------------------------------------------------------------
 %  Option handling lets the user turn off "load all" and selectively enable only those blocks
 %  they are interested in
@@ -353,18 +384,26 @@
 
 \def\ClassGroups{
   \doclass{Arabics}
+  \doclass{CanadianSyllabics}
+  \doclass{CherokeeFull}
   \doclass{Chinese}
   \doclass{CJK}
   \doclass{Cyrillics}
   \doclass{Diacritics}
+  \doclass{EthiopicFull}
+  \doclass{GeorgianFull}
   \doclass{Greek}
   \doclass{Korean}
   \doclass{Japanese}
   \doclass{Latin}
   \doclass{Mathematics}
+  \doclass{MongolianFull}
+  \doclass{MyanmarFull}
   \doclass{Phonetics}
   \doclass{Punctuation}
+  \doclass{SundaneseFull}
   \doclass{Symbols}
+  \doclass{SyriacFull}
   \doclass{Yi}
   \doclass{Other}
 }
@@ -377,6 +416,16 @@
   \do{ArabicSupplement}
 }
 
+\def\CanadianSyllabicsClasses{
+  \do{UnifiedCanadianAboriginalSyllabics}
+  \do{UnifiedCanadianAboriginalSyllabicsExtended}
+}
+
+\def\CherokeeFullClasses{
+  \do{Cherokee}
+  \do{CherokeeSupplement}
+}
+
 \def\ChineseClasses{
   \do{Bopomofo}
   \do{BopomofoExtended}
@@ -393,9 +442,11 @@
   \do{CJKUnifiedIdeographsExtensionC}
   \do{CJKUnifiedIdeographsExtensionD}
   \do{CJKUnifiedIdeographsExtensionE}
+  \do{CJKUnifiedIdeographsExtensionF}
   \do{EnclosedCJKLettersAndMonths}
   \do{EnclosedIdeographicSupplement}
   \do{IdeographicDescriptionCharacters}
+  \do{IdeographicSymbolsAndPunctuation}
   \do{KangxiRadicals}
 }
 
@@ -415,6 +466,7 @@
   \do{CJKUnifiedIdeographsExtensionC}
   \do{CJKUnifiedIdeographsExtensionD}
   \do{CJKUnifiedIdeographsExtensionE}
+  \do{CJKUnifiedIdeographsExtensionF}
   \do{EnclosedCJKLettersAndMonths}
   \do{EnclosedIdeographicSupplement}
   \do{HalfwidthAndFullwidthForms}
@@ -425,18 +477,22 @@
   \do{HangulSyllables}
   \do{Hiragana}
   \do{IdeographicDescriptionCharacters}
+  \do{IdeographicSymbolsAndPunctuation}
+  \do{KanaSupplement}
+  \do{KanaExtendedA}
   \do{Kanbun}
   \do{KangxiRadicals}
   \do{Katakana}
   \do{KatakanaPhoneticExtensions}
-  \do{KanaSupplement}
 }
 
 \def\CyrillicsClasses{
   \do{Cyrillic}
   \do{CyrillicExtendedA}
   \do{CyrillicExtendedB}
+  \do{CyrillicExtendedC}
   \do{CyrillicSupplement}
+  \do{GlagoliticSupplement}
   \do{Glagolitic}
 }
 
@@ -450,6 +506,18 @@
   \do{SpacingModifierLetters}
 }
 
+\def\EthiopicFullClasses{
+  \do{Ethiopic}
+  \do{EthiopicExtended}
+  \do{EthiopicExtendedA}
+  \do{EthiopicSupplement}
+}
+
+\def\GeorgianFullClasses{
+  \do{Georgian}
+  \do{GeorgianSupplement}
+}
+
 \def\GreekClasses{
   \do{Coptic}
   \do{CopticEpactNumbers}
@@ -469,11 +537,12 @@
   \do{CJKUnifiedIdeographs}
   \do{HalfwidthAndFullwidthForms}
   \do{Hiragana}
+  \do{KanaSupplement}
+  \do{KanaExtendedA}
   \do{Kanbun}
   \do{KangxiRadicals}
   \do{Katakana}
   \do{KatakanaPhoneticExtensions}
-  \do{KanaSupplement}
 }
 
 \def\LatinClasses{
@@ -497,6 +566,17 @@
   \do{SupplementalMathematicalOperators}
 }
 
+\def\MongolianFullClasses{
+  \do{Mongolian}
+    \do{MongolianSupplement}
+}
+
+\def\MyanmarFullClasses{
+  \do{Myanmar}
+  \do{MyanmarExtendedA}
+  \do{MyanmarExtendedB}
+}
+
 \def\PhoneticsClasses{
   \do{IPAExtensions}
   \do{PhoneticExtensions}
@@ -508,6 +588,11 @@
   \do{SupplementalPunctuation}
 }
 
+\def\SundaneseFullClasses{
+  \do{Sundanese}
+  \do{SundaneseSupplement}
+}
+
 \def\SymbolsClasses{
   \do{AlchemicalSymbols}
   \do{Arrows}
@@ -533,6 +618,11 @@
   \do{TransportAndMapSymbols}
 }
 
+\def\SyriacFullClasses{
+  \do{Syriac}
+  \do{SyriacSupplement}
+}
+
 \def\YiClasses{
   \do{YiRadicals}
   \do{YiSyllables}
@@ -541,7 +631,7 @@
 \def\OtherClasses{
   \do{AegeanNumbers}
   \do{Ahom}
-  \do{AnatolianHieroglyphs}
+%     AnatolianHieroglyphs (see below)
   \do{AncientGreekMusicalNotation}
   \do{AncientGreekNumbers}
   \do{AncientSymbols}
@@ -558,12 +648,10 @@
   \do{BraillePatterns}
   \do{Buginese}
   \do{Buhid}
-  \do{Carian}
+%     Carian (see below)
   \do{Cham}
   \do{CaucasianAlbanian}
   \do{Chakma}
-  \do{Cherokee}
-  \do{CherokeeSupplement}
   \do{CommonIndicNumberForms}
   \do{Coptic}
   \do{CountingRodNumerals}
@@ -579,12 +667,6 @@
   \do{Elbasan}
   \do{EnclosedAlphanumerics}
   \do{EnclosedAlphanumericSupplement}
-  \do{Ethiopic}
-  \do{EthiopicExtended}
-  \do{EthiopicExtendedA}
-  \do{EthiopicSupplement}
-  \do{Georgian}
-  \do{GeorgianSupplement}
   \do{Gothic}
   \do{Grantha}
   \do{Gujarati}
@@ -625,25 +707,21 @@
   \do{MeroiticHieroglyphs}
   \do{Miao}
   \do{Modi}
-  \do{Mongolian}
   \do{Mro}
   \do{Multani}
   \do{MusicalSymbols}
-  \do{Myanmar}
-  \do{MyanmarExtendedA}
-  \do{MyanmarExtendedB}
   \do{Nabataean}
   \do{NewTaiLue}
   \do{NKo}
   \do{Ogham}
   \do{OlChiki}
   \do{OldHungarian}
-  \do{OldItalic}
-  \do{OldNorthArabian}
+%     OldItalic (see below)
+%     OldNorthArabian (see below)
   \do{OldPermic}
   \do{OldPersian}
-  \do{OldSouthArabian}
-  \do{OldTurkic}
+%     OldSouthArabian (see below)
+%     OldTurkic (see below)
   \do{OpticalCharacterRecognition}
   \do{Oriya}
   \do{Osmanya}
@@ -651,7 +729,7 @@
   \do{Palmyrene}
   \do{PauCinHau}
   \do{PhagsPa}
-  \do{PhaistosDisc}
+%     PhaistosDisc (see below)
   \do{Phoenician}
   \do{PlayingCards}
   \do{PrivateUseArea}
@@ -669,14 +747,11 @@
   \do{SinhalaArchaicNumbers}
   \do{SmallFormVariants}
   \do{SoraSompeng}
-  \do{Sundanese}
-  \do{SundaneseSupplement}
   \do{SuperscriptsAndSubscripts}
 %     SupplementaryPrivateUseAreaA (see below)
 %     SupplementaryPrivateUseAreaB (see below)
 %     SuttonSignWriting (see below)
   \do{SylotiNagri}
-  \do{Syriac}
   \do{Tagalog}
   \do{Tagbanwa}
   \do{Tags}
@@ -693,8 +768,6 @@
   \do{Tifinagh}
   \do{Tirhuta}
   \do{Ugaritic}
-  \do{UnifiedCanadianAboriginalSyllabics}
-  \do{UnifiedCanadianAboriginalSyllabicsExtended}
   \do{Vai}
   \do{VedicExtensions}
   \do{VerticalForms}
@@ -702,11 +775,29 @@
   \do{YijingHexagramSymbols}
 %
   \ifdefined\XeTeXinterwordspaceshaping
-    \do{SupplementaryPrivateUseAreaA}
-    \do{SupplementaryPrivateUseAreaB}
+    \do{Adlam}
+    \do{AnatolianHieroglyphs}
+    \do{Bhaiksuki}
+    \do{Carian}
     \do{Duployan}
+    \do{Marchen}
+    \do{MasaramGondi}
+    \do{Newa}
+    \do{Nushu}
+    \do{OldItalic}
+    \do{OldNorthArabian}
+    \do{OldSouthArabian}
+    \do{OldTurkic}
+    \do{Osage}
+    \do{PhaistosDisc}
     \do{ShorthandFormatControls}
+    \do{Soyombo}
+    \do{SupplementaryPrivateUseAreaA}
+    \do{SupplementaryPrivateUseAreaB}
     \do{SuttonSignWriting}
+    \do{Tangut}
+    \do{TangutComponents}
+    \do{ZanabazarSquare}
   \fi
 }
 
@@ -885,18 +976,27 @@
 % Available informal groups are:
 %
 %   - Arabics
+%   - CanadianSyllabics
+%   - CherokeeFull
 %   - Chinese (including bopomofo)
 %   - CJK (Chinese/Japanese/Korean)
 %   - Cyrillics
 %   - Diacritics
+%   - EthiopicFull
+%   - GeorgianFull
 %   - Greek
-%   - Japanese	(it is advised to set CJK first to a catch-all, then set Japanese for specifics)
+%   - Japanese (it is advised to set CJK first to a catch-all, then set
+%               Japanese for specifics)
 %   - Korean (=Hangul) (same comment as for Japanese)
 %   - Latin
 %   - Mathematics
+%   - MongolianFull
+%   - MyanmarFull
 %   - Phonetics
 %   - Punctuation
+%   - SundaneseFull
 %   - Symbols
+%   - SyriacFull
 %   - Yi
 %   - Other (I am not a fan of lump groups. I hope to un-lump most of it)
 %