fontspec (14aug17)

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

13 files changed, 833 insertions, 76 deletions

diff --git a/Master/texmf-dist/doc/latex/fontspec/README.md b/Master/texmf-dist/doc/latex/fontspec/README.md
index 9b42f4821d4..e3855384086 100644
--- a/Master/texmf-dist/doc/latex/fontspec/README.md
+++ b/Master/texmf-dist/doc/latex/fontspec/README.md
@@ -69,6 +69,13 @@ To add features to the font family currently in use:
 Change history
 --------------
 
+- v2.6d (2017/08/14)
+
+    * Update Scripts to Unicode 1.8.2 (thanks Werner)
+    * Remove `HyphenChar` feature when running LuaTeX — use `\prehyphenchar` LuaTeX primitive instead.
+    * Rewrite test suite so that automated testing actually functions correctly and automatically. Thanks to Joseph for introducing me to Travis CI.
+
+
 - v2.6c (2017/07/23)
 
     * Emergency bug-fix.
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
index 23056a82023..f93f79d9822 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featset.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featset.tex
index f49d164f652..269a0602b3b 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featset.tex
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featset.tex
@@ -62,45 +62,6 @@ To reset default font features, simply call the command with an empty argument:
 Using the |+| form of the command appends the \meta{font features} to any already-selected defaults.
 
 
-\section{Font settings from file}
-
-In addition to the defaults that may be specified in the document as described above, when a font is first loaded, a font settings file is searched
-for with the name `\meta{fontname}\texttt{.fontspec}'.\footnote{Located in the current folder or within a standard \texttt{texmf} location.}
-If you want to \emph{disable} this feature on a per-font basis, use the \feat{IgnoreFontspecFile} font option.
-
-The contents of this file can be used to specify default font features without
-having to have this information present within each document.
-\meta{fontname} is stripped of spaces and file extensions are omitted; for
-example, the line above for \TeX\ Gyre Adventor could be placed in a file
-called \texttt{TeXGyreAdventor.fontspec}, or for specifying options for
-\texttt{texgyreadventor-regular.otf} (when loading by filename), the configuration
-file would be \texttt{texgyreadventor-regular.fontspec}.
-(N.B. the lettercase of the names should match.)
-
-This mechanism can be used to define custom names or aliases for your font collections.
-If you create a file \texttt{MyCharis.fontspec} containing, say,
-\begin{Verbatim}
-  \defaultfontfeatures[My Charis]
-   {
-    Extension = .ttf ,
-    UprightFont = CharisSILR,
-    BoldFont = CharisSILB,
-    ItalicFont = CharisSILI,
-    BoldItalicFont = CharisSILBI,
-    % <any other desired options>
-   }
-\end{Verbatim}
-you can load that custom family with \verb|\fontspec{My Charis}| and similar.
-The optional argument to \cs{defaultfontfeatures} must match that requested by the font loading command (\verb|\fontspec|, etc.), else the options won't take effect.
-
-Finally, note that options for font faces can also be defined in this way.
-To continue the example above, here we colour the different faces:
-\begin{Verbatim}
-  \defaultfontfeatures[CharisSILR]{Color=blue}
-  \defaultfontfeatures[CharisSILB]{Color=red}
-\end{Verbatim}
-And such configuration lines can be stored either inline inside \texttt{My Charis.fontspec} or within their own \texttt{.fontspec} files; in this way, \pkg{fontspec} is designed to handle `nested' configuration options as well.
-
 \section{Working with the currently selected features}
 \label{sec:addfontfeatures}
 
@@ -501,7 +462,9 @@ use this feature in \cs{addfontfeatures}.
 \subsection{The hyphenation character}
 
 The letter used for hyphenation may be chosen with the \feat{HyphenChar}
-feature. It takes three types of input, which are chosen according to some
+feature. This is a \XeTeX-only feature since \LuaTeX\ cannot set the hyphenation character on a per-font basis; see its \cs{prehyphenchar} primitive for further details.
+
+It takes three types of input, which are chosen according to some
 simple rules. If the input is the string \opt{None}, then hyphenation is
 suppressed for this font.
 If the input is a single character, then this
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex
index 90892939bfc..0ee9e8a60e9 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex
@@ -153,6 +153,50 @@ My preference is to always be explicit and include the extension; this also allo
 In previous versions of the package, the |Path| feature was also provided under the alias |ExternalLocation|, but this latter name is now deprecated and should not be used for new documents.
 
 
+\subsection{By custom file name}
+
+When \pkg{fontspec} is first asked to load a font, a font settings file is searched
+for with the name `\meta{fontname}\texttt{.fontspec}'.\footnote{Located in the current folder or within a standard \texttt{texmf} location.}
+If you want to \emph{disable} this feature on a per-font basis, use the \feat{IgnoreFontspecFile} font option.
+
+The contents of this file can be used to specify font shapes and font features without having to have this information present within each document.
+Therefore, it can be more flexible than the alternatives listed above.
+
+When searching for this \texttt{.fontspec} file, \meta{fontname} is stripped of spaces and file extensions are omitted.
+For example, given |\setmainfont{TeX Gyre Adventor}|, the \texttt{.fontspec} file would be
+called \texttt{TeXGyreAdventor.fontspec}.
+If you wanted to transparently load options for |\setmainfont{texgyreadventor-regular.otf}|, the configuration
+file would be \texttt{texgyreadventor-regular.fontspec}.
+
+N.B. that while spaces are stripped, the lettercase of the names should match.
+
+This mechanism can be used to define custom names or aliases for your font collections.
+The syntax within this file follows from the \cs{defaultfontfeatures}, defined in more detail later but mirroring the standard \pkg{fontspec} font loading syntax.
+As an example, suppose we're defining a font family to be loaded with \verb|\setmainfont{My Charis}|.
+The corresponding \texttt{MyCharis.fontspec} file would containing, say,
+\begin{Verbatim}
+  \defaultfontfeatures[My Charis]
+    {
+      Extension = .ttf ,
+      UprightFont    = CharisSILR,
+      BoldFont       = CharisSILB,
+      ItalicFont     = CharisSILI,
+      BoldItalicFont = CharisSILBI,
+      % <any other desired options>
+    }
+\end{Verbatim}
+The optional argument to \cs{defaultfontfeatures} must exactly match that requested by the font loading command (\verb|\setmainfont|, etc.) --- in particular note that spaces are significant here, so |\setmainfont{MyCharis}| will not `see' the default font feature setting within the \texttt{.fontspec} file.
+
+Finally, note that options for individual font faces can also be defined in this way.
+To continue the example above, here we colour the different faces:
+\begin{Verbatim}
+  \defaultfontfeatures[CharisSILR]{Color=blue}
+  \defaultfontfeatures[CharisSILB]{Color=red}
+\end{Verbatim}
+Such configuration lines could be stored either inline inside \texttt{My Charis.fontspec} or within their own \texttt{.fontspec} files; in this way, \pkg{fontspec} is designed to handle `nested' configuration options.
+
+
+
 \subsection{Querying whether a font `exists'}
 
 \cmdbox{
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex
index 31923746f9d..a2ded3ca205 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex
@@ -884,7 +884,150 @@ Thanks to \name{Jonathan Kew}, \name{Yves Codet} and
   \hrule
   \begin{multicols}{4}\setlength\parindent{0pt}
     \sffamily\scriptsize
-    Arabic \par Armenian \par Balinese \par Bengali \par Bopomofo \par Braille \par Buginese \par Buhid \par Byzantine Music \par Canadian Syllabics \par Cherokee \par \dup CJK \par \dup CJK Ideographic \par Coptic \par Cypriot Syllabary \par Cyrillic \par Default \par Deseret \par Devanagari \par Ethiopic \par Georgian \par Glagolitic \par Gothic \par Greek \par Gujarati \par Gurmukhi \par Hangul Jamo \par Hangul \par Hanunoo \par Hebrew \par \dup Hiragana and Katakana \par \dup Kana \par Javanese \par Kannada \par Kharosthi \par Khmer \par Lao \par Latin \par Limbu \par Linear B \par Malayalam \par \dup Math \par \dup Maths \par Mongolian \par Musical Symbols \par Myanmar \par N'ko \par Ogham \par Old Italic \par Old Persian Cuneiform \par Oriya \par Osmanya \par Phags-pa \par Phoenician \par Runic \par Shavian \par Sinhala \par Sumero-Akkadian Cuneiform \par Syloti Nagri \par Syriac \par Tagalog \par Tagbanwa \par Tai Le \par Tai Lu \par Tamil \par Telugu \par Thaana \par Thai \par Tibetan \par Tifinagh \par Ugaritic Cuneiform \par Yi
+    Adlam \par
+    Ahom \par
+    Anatolian Hieroglyphs \par
+    Arabic \par
+    Armenian \par
+    Avestan \par
+    Balinese \par
+    Bamum \par
+    Bassa Vah \par
+    Batak \par
+    Bengali \par
+    Bhaiksuki \par
+    Bopomofo \par
+    Brahmi \par
+    Braille \par
+    Buginese \par
+    Buhid \par
+    Byzantine Music \par
+    Canadian Syllabics \par
+    Carian \par
+    Caucasian Albanian \par
+    Chakma \par
+    Cham \par
+    Cherokee \par
+    \dup CJK \par
+    \dup CJK Ideographic \par
+    Coptic \par
+    Cypriot Syllabary \par
+    Cyrillic \par
+    Default \par
+    Deseret \par
+    Devanagari \par
+    Duployan \par
+    Egyptian Hieroglyphs \par
+    Elbasan \par
+    Ethiopic \par
+    Georgian \par
+    Glagolitic \par
+    Gothic \par
+    Grantha \par
+    Greek \par
+    Gujarati \par
+    Gurmukhi \par
+    Hangul Jamo \par
+    Hangul \par
+    Hanunoo \par
+    Hatran \par
+    Hebrew \par
+    \dup Hiragana and Katakana \par
+    \dup Kana \par
+    Imperial Aramaic \par
+    Inscriptional Pahlavi \par
+    Inscriptional Parthian \par
+    Javanese \par
+    Kaithi \par
+    Kannada \par
+    Kayah Li \par
+    Kharosthi \par
+    Khmer \par
+    Khojki \par
+    Khudawadi \par
+    Lao \par
+    Latin \par
+    Lepcha \par
+    Limbu \par
+    Linear A \par
+    Linear B \par
+    Lisu \par
+    Lycian \par
+    Lydian \par
+    Mahajani \par
+    Malayalam \par
+    Mandaic \par
+    Manichaean \par
+    Marchen \par
+    \dup Math \par
+    \dup Maths \par
+    Meitei Mayek \par
+    Mende Kikakui \par
+    Meroitic Cursive \par
+    Meroitic Hieroglyphs \par
+    Miao \par
+    Modi \par
+    Mongolian \par
+    Mro \par
+    Multani \par
+    Musical Symbols \par
+    Myanmar \par
+    \dup N'Ko \par
+    \dup N'ko \par
+    Nabataean \par
+    Newa \par
+    Ogham \par
+    Ol Chiki \par
+    Old Italic \par
+    Old Hungarian \par
+    Old North Arabian \par
+    Old Permic \par
+    Old Persian Cuneiform \par
+    Old South Arabian \par
+    Old Turkic \par
+    \dup Oriya \par
+    \dup Odia \par
+    Osage \par
+    Osmanya \par
+    Pahawh Hmong \par
+    Palmyrene \par
+    Pau Cin Hau \par
+    Phags-pa \par
+    Phoenician \par
+    Psalter Pahlavi \par
+    Rejang \par
+    Runic \par
+    Samaritan \par
+    Saurashtra \par
+    Sharada \par
+    Shavian \par
+    Siddham \par
+    Sign Writing \par
+    Sinhala \par
+    Sora Sompeng \par
+    Sumero-Akkadian Cuneiform \par
+    Sundanese \par
+    Syloti Nagri \par
+    Syriac \par
+    Tagalog \par
+    Tagbanwa \par
+    Tai Le \par
+    Tai Lu \par
+    Tai Tham \par
+    Tai Viet \par
+    Takri \par
+    Tamil \par
+    Tangut \par
+    Telugu \par
+    Thaana \par
+    Thai \par
+    Tibetan \par
+    Tifinagh \par
+    Tirhuta \par
+    Ugaritic Cuneiform \par
+    Vai \par
+    Warang Citi \par
+    Yi
   \end{multicols}
   \hrule
 \end{table}
@@ -901,7 +1044,390 @@ Thanks to \name{Jonathan Kew}, \name{Yves Codet} and
   \begin{multicols}{6}
     \everypar{\setlength\parindent{0pt}\setlength\hangindent{2em}}
     \sffamily\footnotesize\raggedright
-    Abaza \par Abkhazian \par Adyghe \par Afrikaans \par Afar \par Agaw \par Altai \par Amharic \par Arabic \par Aari \par Arakanese \par Assamese \par Athapaskan \par Avar \par Awadhi \par Aymara \par Azeri \par Badaga \par Baghelkhandi \par Balkar \par Baule \par Berber \par Bench \par Bible Cree \par Belarussian \par Bemba \par Bengali \par Bulgarian \par Bhili \par Bhojpuri \par Bikol \par Bilen \par Blackfoot \par Balochi \par Balante \par Balti \par Bambara \par Bamileke \par Breton \par Brahui \par Braj Bhasha \par Burmese \par Bashkir \par Beti \par Catalan \par Cebuano \par Chechen \par Chaha Gurage \par Chattisgarhi \par Chichewa \par Chukchi \par Chipewyan \par Cherokee \par Chuvash \par Comorian \par Coptic \par Cree \par Carrier \par Crimean Tatar \par Church Slavonic \par Czech \par Danish \par Dargwa \par Woods Cree \par German \par Default \par Dogri \par Divehi \par Djerma \par Dangme \par Dinka \par Dungan \par Dzongkha \par Ebira \par Eastern Cree \par Edo \par Efik \par Greek \par English \par Erzya \par Spanish \par Estonian \par Basque \par Evenki \par Even \par Ewe \par French Antillean \par \dup Farsi \par \dup Parsi \par \dup Persian \par Finnish \par Fijian \par Flemish \par Forest Nenets \par Fon \par Faroese \par French \par Frisian \par Friulian \par Futa \par Fulani \par Ga \par Gaelic \par Gagauz \par Galician \par Garshuni \par Garhwali \par Ge'ez \par Gilyak \par Gumuz \par Gondi \par Greenlandic \par Garo \par Guarani \par Gujarati \par Haitian \par Halam \par Harauti \par Hausa \par Hawaiin \par Hammer-Banna \par Hiligaynon \par Hindi \par High Mari \par Hindko \par Ho \par Harari \par Croatian \par Hungarian \par Armenian \par Igbo \par Ijo \par Ilokano \par Indonesian \par Ingush \par Inuktitut \par Irish \par Irish Traditional \par Icelandic \par Inari Sami \par Italian \par Hebrew \par Javanese \par Yiddish \par Japanese \par Judezmo \par Jula \par Kabardian \par Kachchi \par Kalenjin \par Kannada \par Karachay \par Georgian \par Kazakh \par Kebena \par Khutsuri Georgian \par Khakass \par Khanty-Kazim \par Khmer \par Khanty-Shurishkar \par Khanty-Vakhi \par Khowar \par Kikuyu \par Kirghiz \par Kisii \par Kokni \par Kalmyk \par Kamba \par Kumaoni \par Komo \par Komso \par Kanuri \par Kodagu \par Korean Old Hangul \par Konkani \par Kikongo \par Komi-Permyak \par Korean \par Komi-Zyrian \par Kpelle \par Krio \par Karakalpak \par Karelian \par Karaim \par Karen \par Koorete \par Kashmiri \par Khasi \par Kildin Sami \par Kui \par Kulvi \par Kumyk \par Kurdish \par Kurukh \par Kuy \par Koryak \par Ladin \par Lahuli \par Lak \par Lambani \par Lao \par Latin \par Laz \par L-Cree \par Ladakhi \par Lezgi \par Lingala \par Low Mari \par Limbu \par Lomwe \par Lower Sorbian \par Lule Sami \par Lithuanian \par Luba \par Luganda \par Luhya \par Luo \par Latvian \par Majang \par Makua \par Malayalam Traditional \par Mansi \par Marathi \par Marwari \par Mbundu \par Manchu \par Moose Cree \par Mende \par Me'en \par Mizo \par Macedonian \par Male \par Malagasy \par Malinke \par Malayalam Reformed \par Malay \par Mandinka \par Mongolian \par Manipuri \par Maninka \par Manx Gaelic \par Moksha \par Moldavian \par Mon \par Moroccan \par Maori \par Maithili \par Maltese \par Mundari \par Naga-Assamese \par Nanai \par Naskapi \par N-Cree \par Ndebele \par Ndonga \par Nepali \par Newari \par Nagari \par Norway House Cree \par Nisi \par Niuean \par Nkole \par N'ko \par Dutch \par Nogai \par Norwegian \par Northern Sami \par Northern Tai \par Esperanto \par Nynorsk \par Oji-Cree \par Ojibway \par Oriya \par Oromo \par Ossetian \par Palestinian Aramaic \par Pali \par Punjabi \par Palpa \par Pashto \par Polytonic Greek \par Pilipino \par Palaung \par Polish \par Provencal \par Portuguese \par Chin \par Rajasthani \par R-Cree \par Russian Buriat \par Riang \par Rhaeto-Romanic \par Romanian \par Romany \par Rusyn \par Ruanda \par Russian \par Sadri \par Sanskrit \par Santali \par Sayisi \par Sekota \par Selkup \par Sango \par Shan \par Sibe \par Sidamo \par Silte Gurage \par Skolt Sami \par Slovak \par Slavey \par Slovenian \par Somali \par Samoan \par Sena \par Sindhi \par Sinhalese \par Soninke \par Sodo Gurage \par Sotho \par Albanian \par Serbian \par Saraiki \par Serer \par South Slavey \par Southern Sami \par Suri \par Svan \par Swedish \par Swadaya Aramaic \par Swahili \par Swazi \par Sutu \par Syriac \par Tabasaran \par Tajiki \par Tamil \par Tatar \par TH-Cree \par Telugu \par Tongan \par Tigre \par Tigrinya \par Thai \par Tahitian \par Tibetan \par Turkmen \par Temne \par Tswana \par Tundra Nenets \par Tonga \par Todo \par Turkish \par Tsonga \par Turoyo Aramaic \par Tulu \par Tuvin \par Twi \par Udmurt \par Ukrainian \par Urdu \par Upper Sorbian \par Uyghur \par Uzbek \par Venda \par Vietnamese \par Wa \par Wagdi \par West-Cree \par Welsh \par Wolof \par Tai Lue \par Xhosa \par Yakut \par Yoruba \par Y-Cree \par Yi Classic \par Yi Modern \par Chinese Hong Kong \par Chinese Phonetic \par Chinese Simplified \par Chinese Traditional \par Zande \par Zulu
+    Abaza \par
+    Abkhazian \par
+    Adyghe \par
+    Afrikaans \par
+    Afar \par
+    Agaw \par
+    Altai \par
+    Amharic \par
+    Arabic \par
+    Aari \par
+    Arakanese \par
+    Assamese \par
+    Athapaskan \par
+    Avar \par
+    Awadhi \par
+    Aymara \par
+    Azeri \par
+    Badaga \par
+    Baghelkhandi \par
+    Balkar \par
+    Baule \par
+    Berber \par
+    Bench \par
+    Bible Cree \par
+    Belarussian \par
+    Bemba \par
+    Bengali \par
+    Bulgarian \par
+    Bhili \par
+    Bhojpuri \par
+    Bikol \par
+    Bilen \par
+    Blackfoot \par
+    Balochi \par
+    Balante \par
+    Balti \par
+    Bambara \par
+    Bamileke \par
+    Breton \par
+    Brahui \par
+    Braj Bhasha \par
+    Burmese \par
+    Bashkir \par
+    Beti \par
+    Catalan \par
+    Cebuano \par
+    Chechen \par
+    Chaha Gurage \par
+    Chattisgarhi \par
+    Chichewa \par
+    Chukchi \par
+    Chipewyan \par
+    Cherokee \par
+    Chuvash \par
+    Comorian \par
+    Coptic \par
+    Cree \par
+    Carrier \par
+    Crimean Tatar \par
+    Church Slavonic \par
+    Czech \par
+    Danish \par
+    Dargwa \par
+    Woods Cree \par
+    German \par
+    Default \par
+    Dogri \par
+    Divehi \par
+    Djerma \par
+    Dangme \par
+    Dinka \par
+    Dungan \par
+    Dzongkha \par
+    Ebira \par
+    Eastern Cree \par
+    Edo \par
+    Efik \par
+    Greek \par
+    English \par
+    Erzya \par
+    Spanish \par
+    Estonian \par
+    Basque \par
+    Evenki \par
+    Even \par
+    Ewe \par
+    French Antillean \par
+    \dup Farsi \par
+    \dup Parsi \par
+    \dup Persian \par
+    Finnish \par
+    Fijian \par
+    Flemish \par
+    Forest Nenets \par
+    Fon \par
+    Faroese \par
+    French \par
+    Frisian \par
+    Friulian \par
+    Futa \par
+    Fulani \par
+    Ga \par
+    Gaelic \par
+    Gagauz \par
+    Galician \par
+    Garshuni \par
+    Garhwali \par
+    Ge'ez \par
+    Gilyak \par
+    Gumuz \par
+    Gondi \par
+    Greenlandic \par
+    Garo \par
+    Guarani \par
+    Gujarati \par
+    Haitian \par
+    Halam \par
+    Harauti \par
+    Hausa \par
+    Hawaiin \par
+    Hammer-Banna \par
+    Hiligaynon \par
+    Hindi \par
+    High Mari \par
+    Hindko \par
+    Ho \par
+    Harari \par
+    Croatian \par
+    Hungarian \par
+    Armenian \par
+    Igbo \par
+    Ijo \par
+    Ilokano \par
+    Indonesian \par
+    Ingush \par
+    Inuktitut \par
+    Irish \par
+    Irish Traditional \par
+    Icelandic \par
+    Inari Sami \par
+    Italian \par
+    Hebrew \par
+    Javanese \par
+    Yiddish \par
+    Japanese \par
+    Judezmo \par
+    Jula \par
+    Kabardian \par
+    Kachchi \par
+    Kalenjin \par
+    Kannada \par
+    Karachay \par
+    Georgian \par
+    Kazakh \par
+    Kebena \par
+    Khutsuri Georgian \par
+    Khakass \par
+    Khanty-Kazim \par
+    Khmer \par
+    Khanty-Shurishkar \par
+    Khanty-Vakhi \par
+    Khowar \par
+    Kikuyu \par
+    Kirghiz \par
+    Kisii \par
+    Kokni \par
+    Kalmyk \par
+    Kamba \par
+    Kumaoni \par
+    Komo \par
+    Komso \par
+    Kanuri \par
+    Kodagu \par
+    Korean Old Hangul \par
+    Konkani \par
+    Kikongo \par
+    Komi-Permyak \par
+    Korean \par
+    Komi-Zyrian \par
+    Kpelle \par
+    Krio \par
+    Karakalpak \par
+    Karelian \par
+    Karaim \par
+    Karen \par
+    Koorete \par
+    Kashmiri \par
+    Khasi \par
+    Kildin Sami \par
+    Kui \par
+    Kulvi \par
+    Kumyk \par
+    Kurdish \par
+    Kurukh \par
+    Kuy \par
+    Koryak \par
+    Ladin \par
+    Lahuli \par
+    Lak \par
+    Lambani \par
+    Lao \par
+    Latin \par
+    Laz \par
+    L-Cree \par
+    Ladakhi \par
+    Lezgi \par
+    Lingala \par
+    Low Mari \par
+    Limbu \par
+    Lomwe \par
+    Lower Sorbian \par
+    Lule Sami \par
+    Lithuanian \par
+    Luba \par
+    Luganda \par
+    Luhya \par
+    Luo \par
+    Latvian \par
+    Majang \par
+    Makua \par
+    Malayalam Traditional \par
+    Mansi \par
+    Marathi \par
+    Marwari \par
+    Mbundu \par
+    Manchu \par
+    Moose Cree \par
+    Mende \par
+    Me'en \par
+    Mizo \par
+    Macedonian \par
+    Male \par
+    Malagasy \par
+    Malinke \par
+    Malayalam Reformed \par
+    Malay \par
+    Mandinka \par
+    Mongolian \par
+    Manipuri \par
+    Maninka \par
+    Manx Gaelic \par
+    Moksha \par
+    Moldavian \par
+    Mon \par
+    Moroccan \par
+    Maori \par
+    Maithili \par
+    Maltese \par
+    Mundari \par
+    Naga-Assamese \par
+    Nanai \par
+    Naskapi \par
+    N-Cree \par
+    Ndebele \par
+    Ndonga \par
+    Nepali \par
+    Newari \par
+    Nagari \par
+    Norway House Cree \par
+    Nisi \par
+    Niuean \par
+    Nkole \par
+    N'ko \par
+    Dutch \par
+    Nogai \par
+    Norwegian \par
+    Northern Sami \par
+    Northern Tai \par
+    Esperanto \par
+    Nynorsk \par
+    Oji-Cree \par
+    Ojibway \par
+    Oriya \par
+    Oromo \par
+    Ossetian \par
+    Palestinian Aramaic \par
+    Pali \par
+    Punjabi \par
+    Palpa \par
+    Pashto \par
+    Polytonic Greek \par
+    Pilipino \par
+    Palaung \par
+    Polish \par
+    Provencal \par
+    Portuguese \par
+    Chin \par
+    Rajasthani \par
+    R-Cree \par
+    Russian Buriat \par
+    Riang \par
+    Rhaeto-Romanic \par
+    Romanian \par
+    Romany \par
+    Rusyn \par
+    Ruanda \par
+    Russian \par
+    Sadri \par
+    Sanskrit \par
+    Santali \par
+    Sayisi \par
+    Sekota \par
+    Selkup \par
+    Sango \par
+    Shan \par
+    Sibe \par
+    Sidamo \par
+    Silte Gurage \par
+    Skolt Sami \par
+    Slovak \par
+    Slavey \par
+    Slovenian \par
+    Somali \par
+    Samoan \par
+    Sena \par
+    Sindhi \par
+    Sinhalese \par
+    Soninke \par
+    Sodo Gurage \par
+    Sotho \par
+    Albanian \par
+    Serbian \par
+    Saraiki \par
+    Serer \par
+    South Slavey \par
+    Southern Sami \par
+    Suri \par
+    Svan \par
+    Swedish \par
+    Swadaya Aramaic \par
+    Swahili \par
+    Swazi \par
+    Sutu \par
+    Syriac \par
+    Tabasaran \par
+    Tajiki \par
+    Tamil \par
+    Tatar \par
+    TH-Cree \par
+    Telugu \par
+    Tongan \par
+    Tigre \par
+    Tigrinya \par
+    Thai \par
+    Tahitian \par
+    Tibetan \par
+    Turkmen \par
+    Temne \par
+    Tswana \par
+    Tundra Nenets \par
+    Tonga \par
+    Todo \par
+    Turkish \par
+    Tsonga \par
+    Turoyo Aramaic \par
+    Tulu \par
+    Tuvin \par
+    Twi \par
+    Udmurt \par
+    Ukrainian \par
+    Urdu \par
+    Upper Sorbian \par
+    Uyghur \par
+    Uzbek \par
+    Venda \par
+    Vietnamese \par
+    Wa \par
+    Wagdi \par
+    West-Cree \par
+    Welsh \par
+    Wolof \par
+    Tai Lue \par
+    Xhosa \par
+    Yakut \par
+    Yoruba \par
+    Y-Cree \par
+    Yi Classic \par
+    Yi Modern \par
+    Chinese Hong Kong \par
+    Chinese Phonetic \par
+    Chinese Simplified \par
+    Chinese Traditional \par
+    Zande \par
+    Zulu
   \end{multicols}
   \hspace{4pt}
   \hrule
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx
index 079713020fd..8f790533a7c 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx
@@ -580,29 +580,25 @@
 %    \begin{macrocode}
 \@@_keys_define_code:nnn {fontspec} {HyphenChar}
  {
+  \@@_warning:nx {only-xetex-feature} {HyphenChar}
   \str_if_eq:nnTF {#1} {None}
    {
     \tl_put_right:Nn \l_@@_postadjust_tl
       { \hyphenchar \font = -1 \relax }
    }
    {
+
     \tl_if_single:nTF {#1}
      { \tl_set:Nn \l_fontspec_hyphenchar_tl {`#1} }
      { \tl_set:Nn \l_fontspec_hyphenchar_tl { #1} }
+
     \@@_primitive_font_glyph_if_exist:NnTF \l_fontspec_font {\l_fontspec_hyphenchar_tl}
      {
       \tl_put_right:Nn \l_@@_postadjust_tl
-%<*xetexx>
         { \hyphenchar \font = \l_fontspec_hyphenchar_tl \scan_stop: }
-%</xetexx>
-%<*luatex>
-        {
-          \hyphenchar \font = \c_zero
-          \int_set:Nn \luatex_prehyphenchar:D { \l_fontspec_hyphenchar_tl }
-        }
-%</luatex>
      }
      { \@@_error:nx {no-glyph}{#1} }
+
    }
  }
 \@@_aff_error:n {HyphenChar}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-scripts.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-scripts.dtx
index 660b4187b79..890fd5d2334 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-scripts.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-scripts.dtx
@@ -8,16 +8,29 @@
 % \fi
 %
 %    \begin{macrocode}
+\newfontscript{Adlam}{adlm}
+\newfontscript{Ahom}{ahom}
+\newfontscript{Anatolian~Hieroglyphs}{hluw}
 \newfontscript{Arabic}{arab}
 \newfontscript{Armenian}{armn}
+\newfontscript{Avestan}{avst}
 \newfontscript{Balinese}{bali}
+\newfontscript{Bamum}{bamu}
+\newfontscript{Bassa~Vah}{bass}
+\newfontscript{Batak}{batk}
 \newfontscript{Bengali}{bng2,beng}
+\newfontscript{Bhaiksuki}{bhks}
 \newfontscript{Bopomofo}{bopo}
+\newfontscript{Brahmi}{brah}
 \newfontscript{Braille}{brai}
 \newfontscript{Buginese}{bugi}
 \newfontscript{Buhid}{buhd}
 \newfontscript{Byzantine~Music}{byzm}
 \newfontscript{Canadian~Syllabics}{cans}
+\newfontscript{Carian}{cari}
+\newfontscript{Caucasian~Albanian}{aghb}
+\newfontscript{Chakma}{cakm}
+\newfontscript{Cham}{cham}
 \newfontscript{Cherokee}{cher}
 \newfontscript{CJK~Ideographic}{hani}
 \newfontscript{Coptic}{copt}
@@ -26,63 +39,122 @@
 \newfontscript{Default}{DFLT}
 \newfontscript{Deseret}{dsrt}
 \newfontscript{Devanagari}{dev2,deva}
+\newfontscript{Duployan}{dupl}
+\newfontscript{Egyptian~Hieroglyphs}{egyp}
+\newfontscript{Elbasan}{elba}
 \newfontscript{Ethiopic}{ethi}
 \newfontscript{Georgian}{geor}
 \newfontscript{Glagolitic}{glag}
 \newfontscript{Gothic}{goth}
+\newfontscript{Grantha}{gran}
 \newfontscript{Greek}{grek}
 \newfontscript{Gujarati}{gjr2,gujr}
 \newfontscript{Gurmukhi}{gur2,guru}
 \newfontscript{Hangul~Jamo}{jamo}
 \newfontscript{Hangul}{hang}
 \newfontscript{Hanunoo}{hano}
+\newfontscript{Hatran}{hatr}
 \newfontscript{Hebrew}{hebr}
 \newfontscript{Hiragana~and~Katakana}{kana}
+\newfontscript{Imperial~Aramaic}{armi}
+\newfontscript{Inscriptional~Pahlavi}{phli}
+\newfontscript{Inscriptional~Parthian}{prti}
 \newfontscript{Javanese}{java}
+\newfontscript{Kaithi}{kthi}
 \newfontscript{Kannada}{knd2,knda}
+\newfontscript{Kayah~Li}{kali}
 \newfontscript{Kharosthi}{khar}
 \newfontscript{Khmer}{khmr}
+\newfontscript{Khojki}{khoj}
+\newfontscript{Khudawadi}{sind}
 \newfontscript{Lao}{lao~}
 \newfontscript{Latin}{latn}
+\newfontscript{Lepcha}{lepc}
 \newfontscript{Limbu}{limb}
+\newfontscript{Linear~A}{lina}
 \newfontscript{Linear~B}{linb}
+\newfontscript{Lisu}{lisu}
+\newfontscript{Lycian}{lyci}
+\newfontscript{Lydian}{lydi}
+\newfontscript{Mahajani}{mahj}
 \newfontscript{Malayalam}{mlm2,mlym}
+\newfontscript{Mandaic}{mand}
+\newfontscript{Manichaean}{mani}
+\newfontscript{Marchen}{marc}
 \newfontscript{Math}{math}
+\newfontscript{Meitei~Mayek}{mtei}
+\newfontscript{Mende~Kikakui}{mend}
+\newfontscript{Meroitic~Cursive}{merc}
+\newfontscript{Meroitic~Hieroglyphs}{mero}
+\newfontscript{Miao}{plrd}
+\newfontscript{Modi}{modi}
 \newfontscript{Mongolian}{mong}
+\newfontscript{Mro}{mroo}
+\newfontscript{Multani}{mult}
 \newfontscript{Musical~Symbols}{musc}
-\newfontscript{Myanmar}{mymr}
-\newfontscript{N'ko}{nko~}
+\newfontscript{Myanmar}{mym2,mymr}
+\newfontscript{N'Ko}{nko~}
+\newfontscript{Nabataean}{nbat}
+\newfontscript{Newa}{newa}
+\newfontscript{Odia}{ory2,orya}
 \newfontscript{Ogham}{ogam}
+\newfontscript{Ol~Chiki}{olck}
 \newfontscript{Old~Italic}{ital}
+\newfontscript{Old~Hungarian}{hung}
+\newfontscript{Old~North~Arabian}{narb}
+\newfontscript{Old~Permic}{perm}
 \newfontscript{Old~Persian~Cuneiform}{xpeo}
-\newfontscript{Oriya}{ory2,orya}
+\newfontscript{Old~South~Arabian}{sarb}
+\newfontscript{Old~Turkic}{orkh}
+\newfontscript{Osage}{osge}
 \newfontscript{Osmanya}{osma}
+\newfontscript{Pahawh~Hmong}{hmng}
+\newfontscript{Palmyrene}{palm}
+\newfontscript{Pau~Cin~Hau}{pauc}
 \newfontscript{Phags-pa}{phag}
 \newfontscript{Phoenician}{phnx}
+\newfontscript{Psalter~Pahlavi}{phlp}
+\newfontscript{Rejang}{rjng}
 \newfontscript{Runic}{runr}
+\newfontscript{Samaritan}{samr}
+\newfontscript{Saurashtra}{saur}
+\newfontscript{Sharada}{shrd}
 \newfontscript{Shavian}{shaw}
+\newfontscript{Siddham}{sidd}
+\newfontscript{Sign~Writing}{sgnw}
 \newfontscript{Sinhala}{sinh}
+\newfontscript{Sora~Sompeng}{sora}
 \newfontscript{Sumero-Akkadian~Cuneiform}{xsux}
+\newfontscript{Sundanese}{sund}
 \newfontscript{Syloti~Nagri}{sylo}
 \newfontscript{Syriac}{syrc}
 \newfontscript{Tagalog}{tglg}
 \newfontscript{Tagbanwa}{tagb}
 \newfontscript{Tai~Le}{tale}
 \newfontscript{Tai~Lu}{talu}
+\newfontscript{Tai~Tham}{lana}
+\newfontscript{Tai~Viet}{tavt}
+\newfontscript{Takri}{takr}
 \newfontscript{Tamil}{tml2,taml}
+\newfontscript{Tangut}{tang}
 \newfontscript{Telugu}{tel2,telu}
 \newfontscript{Thaana}{thaa}
 \newfontscript{Thai}{thai}
 \newfontscript{Tibetan}{tibt}
 \newfontscript{Tifinagh}{tfng}
+\newfontscript{Tirhuta}{tirh}
 \newfontscript{Ugaritic~Cuneiform}{ugar}
+\newfontscript{Vai}{vai~}
+\newfontscript{Warang~Citi}{wara}
 \newfontscript{Yi}{yi~~}
 %    \end{macrocode}
-% For convenience:
+% For convenience or backwards compatibility:
 %    \begin{macrocode}
+\newfontscript{CJK}{hani}
 \newfontscript{Kana}{kana}
 \newfontscript{Maths}{math}
-\newfontscript{CJK}{hani}
+\newfontscript{N'ko}{nko~}
+\newfontscript{Oriya}{ory2,orya}
 %    \end{macrocode}
 %
 % \iffalse
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-user.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-user.dtx
index ed835193426..6ba11f53a0d 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-user.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-user.dtx
@@ -294,7 +294,7 @@
       \g_@@_default_fontopts_clist {#2}
   }
 %    \end{macrocode}
-% The optional argument specifies a font identifier.
+% The optional argument |#2| specifies font identifier(s).
 % Branch for either (a)~single token input such as \verb|\rmdefault|, or (b)~otherwise assume its a fontname.
 % In that case, strip spaces and file extensions and lower-case to ensure consistency.
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
index ebcd2544c24..06b3f7ae308 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
@@ -79,14 +79,14 @@ And the derived files: fontspec*.sty,fontspec.lua, fontspec.pdf.
 %<fontspec&xetexx>\ProvidesExplPackage{fontspec-xetex}%
 %<fontspec&luatex>\ProvidesExplPackage{fontspec-luatex}%
 %<*fontspec>
-  {2017/07/23}{2.6c}{Font selection for XeLaTeX and LuaLaTeX}
+  {2017/08/14}{2.6d}{Font selection for XeLaTeX and LuaLaTeX}
 %</fontspec>
 %<lua>fontspec          = fontspec or {}
 %<lua>local fontspec    = fontspec
 %<lua>fontspec.module   = {
 %<lua>    name          = "fontspec",
-%<lua>    version       = "2.6c",
-%<lua>    date          = "2017/07/23",
+%<lua>    version       = "2.6d",
+%<lua>    date          = "2017/08/14",
 %<lua>    description   = "Font selection for XeLaTeX and LuaLaTeX",
 %<lua>    author        = "Khaled Hosny, Philipp Gesang, Will Robertson",
 %<lua>    copyright     = "Khaled Hosny, Philipp Gesang, Will Robertson",
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
index ae0803cb57a..54bb94c2835 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
@@ -32,7 +32,7 @@
 \RequirePackage{expl3}
 \RequirePackage{xparse}
 \ProvidesExplPackage{fontspec-luatex}%
-  {2017/07/23}{2.6c}{Font selection for XeLaTeX and LuaLaTeX}
+  {2017/08/14}{2.6d}{Font selection for XeLaTeX and LuaLaTeX}
 \bool_new:N \l__fontspec_firsttime_bool
 \bool_new:N \l__fontspec_nobf_bool
 \bool_new:N \l__fontspec_noit_bool
@@ -2195,24 +2195,25 @@
  }
 \__fontspec_keys_define_code:nnn {fontspec} {HyphenChar}
  {
+  \__fontspec_warning:nx {only-xetex-feature} {HyphenChar}
   \str_if_eq:nnTF {#1} {None}
    {
     \tl_put_right:Nn \l__fontspec_postadjust_tl
       { \hyphenchar \font = -1 \relax }
    }
    {
+
     \tl_if_single:nTF {#1}
      { \tl_set:Nn \l_fontspec_hyphenchar_tl {`#1} }
      { \tl_set:Nn \l_fontspec_hyphenchar_tl { #1} }
+
     \__fontspec_primitive_font_glyph_if_exist:NnTF \l_fontspec_font {\l_fontspec_hyphenchar_tl}
      {
       \tl_put_right:Nn \l__fontspec_postadjust_tl
-        {
-          \hyphenchar \font = \c_zero
-          \int_set:Nn \luatex_prehyphenchar:D { \l_fontspec_hyphenchar_tl }
-        }
+        { \hyphenchar \font = \l_fontspec_hyphenchar_tl \scan_stop: }
      }
      { \__fontspec_error:nx {no-glyph}{#1} }
+
    }
  }
 \__fontspec_aff_error:n {HyphenChar}
@@ -2714,16 +2715,29 @@
 \__fontspec_ot_compat:nn {Diacritics}  {AboveBase}
 \__fontspec_ot_compat:nn {Diacritics}  {BelowBase}
 
+\newfontscript{Adlam}{adlm}
+\newfontscript{Ahom}{ahom}
+\newfontscript{Anatolian~Hieroglyphs}{hluw}
 \newfontscript{Arabic}{arab}
 \newfontscript{Armenian}{armn}
+\newfontscript{Avestan}{avst}
 \newfontscript{Balinese}{bali}
+\newfontscript{Bamum}{bamu}
+\newfontscript{Bassa~Vah}{bass}
+\newfontscript{Batak}{batk}
 \newfontscript{Bengali}{bng2,beng}
+\newfontscript{Bhaiksuki}{bhks}
 \newfontscript{Bopomofo}{bopo}
+\newfontscript{Brahmi}{brah}
 \newfontscript{Braille}{brai}
 \newfontscript{Buginese}{bugi}
 \newfontscript{Buhid}{buhd}
 \newfontscript{Byzantine~Music}{byzm}
 \newfontscript{Canadian~Syllabics}{cans}
+\newfontscript{Carian}{cari}
+\newfontscript{Caucasian~Albanian}{aghb}
+\newfontscript{Chakma}{cakm}
+\newfontscript{Cham}{cham}
 \newfontscript{Cherokee}{cher}
 \newfontscript{CJK~Ideographic}{hani}
 \newfontscript{Coptic}{copt}
@@ -2732,60 +2746,119 @@
 \newfontscript{Default}{DFLT}
 \newfontscript{Deseret}{dsrt}
 \newfontscript{Devanagari}{dev2,deva}
+\newfontscript{Duployan}{dupl}
+\newfontscript{Egyptian~Hieroglyphs}{egyp}
+\newfontscript{Elbasan}{elba}
 \newfontscript{Ethiopic}{ethi}
 \newfontscript{Georgian}{geor}
 \newfontscript{Glagolitic}{glag}
 \newfontscript{Gothic}{goth}
+\newfontscript{Grantha}{gran}
 \newfontscript{Greek}{grek}
 \newfontscript{Gujarati}{gjr2,gujr}
 \newfontscript{Gurmukhi}{gur2,guru}
 \newfontscript{Hangul~Jamo}{jamo}
 \newfontscript{Hangul}{hang}
 \newfontscript{Hanunoo}{hano}
+\newfontscript{Hatran}{hatr}
 \newfontscript{Hebrew}{hebr}
 \newfontscript{Hiragana~and~Katakana}{kana}
+\newfontscript{Imperial~Aramaic}{armi}
+\newfontscript{Inscriptional~Pahlavi}{phli}
+\newfontscript{Inscriptional~Parthian}{prti}
 \newfontscript{Javanese}{java}
+\newfontscript{Kaithi}{kthi}
 \newfontscript{Kannada}{knd2,knda}
+\newfontscript{Kayah~Li}{kali}
 \newfontscript{Kharosthi}{khar}
 \newfontscript{Khmer}{khmr}
+\newfontscript{Khojki}{khoj}
+\newfontscript{Khudawadi}{sind}
 \newfontscript{Lao}{lao~}
 \newfontscript{Latin}{latn}
+\newfontscript{Lepcha}{lepc}
 \newfontscript{Limbu}{limb}
+\newfontscript{Linear~A}{lina}
 \newfontscript{Linear~B}{linb}
+\newfontscript{Lisu}{lisu}
+\newfontscript{Lycian}{lyci}
+\newfontscript{Lydian}{lydi}
+\newfontscript{Mahajani}{mahj}
 \newfontscript{Malayalam}{mlm2,mlym}
+\newfontscript{Mandaic}{mand}
+\newfontscript{Manichaean}{mani}
+\newfontscript{Marchen}{marc}
 \newfontscript{Math}{math}
+\newfontscript{Meitei~Mayek}{mtei}
+\newfontscript{Mende~Kikakui}{mend}
+\newfontscript{Meroitic~Cursive}{merc}
+\newfontscript{Meroitic~Hieroglyphs}{mero}
+\newfontscript{Miao}{plrd}
+\newfontscript{Modi}{modi}
 \newfontscript{Mongolian}{mong}
+\newfontscript{Mro}{mroo}
+\newfontscript{Multani}{mult}
 \newfontscript{Musical~Symbols}{musc}
-\newfontscript{Myanmar}{mymr}
-\newfontscript{N'ko}{nko~}
+\newfontscript{Myanmar}{mym2,mymr}
+\newfontscript{N'Ko}{nko~}
+\newfontscript{Nabataean}{nbat}
+\newfontscript{Newa}{newa}
+\newfontscript{Odia}{ory2,orya}
 \newfontscript{Ogham}{ogam}
+\newfontscript{Ol~Chiki}{olck}
 \newfontscript{Old~Italic}{ital}
+\newfontscript{Old~Hungarian}{hung}
+\newfontscript{Old~North~Arabian}{narb}
+\newfontscript{Old~Permic}{perm}
 \newfontscript{Old~Persian~Cuneiform}{xpeo}
-\newfontscript{Oriya}{ory2,orya}
+\newfontscript{Old~South~Arabian}{sarb}
+\newfontscript{Old~Turkic}{orkh}
+\newfontscript{Osage}{osge}
 \newfontscript{Osmanya}{osma}
+\newfontscript{Pahawh~Hmong}{hmng}
+\newfontscript{Palmyrene}{palm}
+\newfontscript{Pau~Cin~Hau}{pauc}
 \newfontscript{Phags-pa}{phag}
 \newfontscript{Phoenician}{phnx}
+\newfontscript{Psalter~Pahlavi}{phlp}
+\newfontscript{Rejang}{rjng}
 \newfontscript{Runic}{runr}
+\newfontscript{Samaritan}{samr}
+\newfontscript{Saurashtra}{saur}
+\newfontscript{Sharada}{shrd}
 \newfontscript{Shavian}{shaw}
+\newfontscript{Siddham}{sidd}
+\newfontscript{Sign~Writing}{sgnw}
 \newfontscript{Sinhala}{sinh}
+\newfontscript{Sora~Sompeng}{sora}
 \newfontscript{Sumero-Akkadian~Cuneiform}{xsux}
+\newfontscript{Sundanese}{sund}
 \newfontscript{Syloti~Nagri}{sylo}
 \newfontscript{Syriac}{syrc}
 \newfontscript{Tagalog}{tglg}
 \newfontscript{Tagbanwa}{tagb}
 \newfontscript{Tai~Le}{tale}
 \newfontscript{Tai~Lu}{talu}
+\newfontscript{Tai~Tham}{lana}
+\newfontscript{Tai~Viet}{tavt}
+\newfontscript{Takri}{takr}
 \newfontscript{Tamil}{tml2,taml}
+\newfontscript{Tangut}{tang}
 \newfontscript{Telugu}{tel2,telu}
 \newfontscript{Thaana}{thaa}
 \newfontscript{Thai}{thai}
 \newfontscript{Tibetan}{tibt}
 \newfontscript{Tifinagh}{tfng}
+\newfontscript{Tirhuta}{tirh}
 \newfontscript{Ugaritic~Cuneiform}{ugar}
+\newfontscript{Vai}{vai~}
+\newfontscript{Warang~Citi}{wara}
 \newfontscript{Yi}{yi~~}
+\newfontscript{CJK}{hani}
 \newfontscript{Kana}{kana}
 \newfontscript{Maths}{math}
-\newfontscript{CJK}{hani}
+\newfontscript{N'ko}{nko~}
+\newfontscript{Oriya}{ory2,orya}
 
 \newfontlanguage{Abaza}{ABA}
 \newfontlanguage{Abkhazian}{ABK}
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
index 43f2f7b9172..6ff78f06dbb 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
@@ -32,7 +32,7 @@
 \RequirePackage{expl3}
 \RequirePackage{xparse}
 \ProvidesExplPackage{fontspec-xetex}%
-  {2017/07/23}{2.6c}{Font selection for XeLaTeX and LuaLaTeX}
+  {2017/08/14}{2.6d}{Font selection for XeLaTeX and LuaLaTeX}
 \bool_new:N \l__fontspec_firsttime_bool
 \bool_new:N \l__fontspec_nobf_bool
 \bool_new:N \l__fontspec_noit_bool
@@ -2319,21 +2319,25 @@
  }
 \__fontspec_keys_define_code:nnn {fontspec} {HyphenChar}
  {
+  \__fontspec_warning:nx {only-xetex-feature} {HyphenChar}
   \str_if_eq:nnTF {#1} {None}
    {
     \tl_put_right:Nn \l__fontspec_postadjust_tl
       { \hyphenchar \font = -1 \relax }
    }
    {
+
     \tl_if_single:nTF {#1}
      { \tl_set:Nn \l_fontspec_hyphenchar_tl {`#1} }
      { \tl_set:Nn \l_fontspec_hyphenchar_tl { #1} }
+
     \__fontspec_primitive_font_glyph_if_exist:NnTF \l_fontspec_font {\l_fontspec_hyphenchar_tl}
      {
       \tl_put_right:Nn \l__fontspec_postadjust_tl
         { \hyphenchar \font = \l_fontspec_hyphenchar_tl \scan_stop: }
      }
      { \__fontspec_error:nx {no-glyph}{#1} }
+
    }
  }
 \__fontspec_aff_error:n {HyphenChar}
@@ -2852,16 +2856,29 @@
 \__fontspec_ot_compat:nn {Diacritics}  {AboveBase}
 \__fontspec_ot_compat:nn {Diacritics}  {BelowBase}
 
+\newfontscript{Adlam}{adlm}
+\newfontscript{Ahom}{ahom}
+\newfontscript{Anatolian~Hieroglyphs}{hluw}
 \newfontscript{Arabic}{arab}
 \newfontscript{Armenian}{armn}
+\newfontscript{Avestan}{avst}
 \newfontscript{Balinese}{bali}
+\newfontscript{Bamum}{bamu}
+\newfontscript{Bassa~Vah}{bass}
+\newfontscript{Batak}{batk}
 \newfontscript{Bengali}{bng2,beng}
+\newfontscript{Bhaiksuki}{bhks}
 \newfontscript{Bopomofo}{bopo}
+\newfontscript{Brahmi}{brah}
 \newfontscript{Braille}{brai}
 \newfontscript{Buginese}{bugi}
 \newfontscript{Buhid}{buhd}
 \newfontscript{Byzantine~Music}{byzm}
 \newfontscript{Canadian~Syllabics}{cans}
+\newfontscript{Carian}{cari}
+\newfontscript{Caucasian~Albanian}{aghb}
+\newfontscript{Chakma}{cakm}
+\newfontscript{Cham}{cham}
 \newfontscript{Cherokee}{cher}
 \newfontscript{CJK~Ideographic}{hani}
 \newfontscript{Coptic}{copt}
@@ -2870,60 +2887,119 @@
 \newfontscript{Default}{DFLT}
 \newfontscript{Deseret}{dsrt}
 \newfontscript{Devanagari}{dev2,deva}
+\newfontscript{Duployan}{dupl}
+\newfontscript{Egyptian~Hieroglyphs}{egyp}
+\newfontscript{Elbasan}{elba}
 \newfontscript{Ethiopic}{ethi}
 \newfontscript{Georgian}{geor}
 \newfontscript{Glagolitic}{glag}
 \newfontscript{Gothic}{goth}
+\newfontscript{Grantha}{gran}
 \newfontscript{Greek}{grek}
 \newfontscript{Gujarati}{gjr2,gujr}
 \newfontscript{Gurmukhi}{gur2,guru}
 \newfontscript{Hangul~Jamo}{jamo}
 \newfontscript{Hangul}{hang}
 \newfontscript{Hanunoo}{hano}
+\newfontscript{Hatran}{hatr}
 \newfontscript{Hebrew}{hebr}
 \newfontscript{Hiragana~and~Katakana}{kana}
+\newfontscript{Imperial~Aramaic}{armi}
+\newfontscript{Inscriptional~Pahlavi}{phli}
+\newfontscript{Inscriptional~Parthian}{prti}
 \newfontscript{Javanese}{java}
+\newfontscript{Kaithi}{kthi}
 \newfontscript{Kannada}{knd2,knda}
+\newfontscript{Kayah~Li}{kali}
 \newfontscript{Kharosthi}{khar}
 \newfontscript{Khmer}{khmr}
+\newfontscript{Khojki}{khoj}
+\newfontscript{Khudawadi}{sind}
 \newfontscript{Lao}{lao~}
 \newfontscript{Latin}{latn}
+\newfontscript{Lepcha}{lepc}
 \newfontscript{Limbu}{limb}
+\newfontscript{Linear~A}{lina}
 \newfontscript{Linear~B}{linb}
+\newfontscript{Lisu}{lisu}
+\newfontscript{Lycian}{lyci}
+\newfontscript{Lydian}{lydi}
+\newfontscript{Mahajani}{mahj}
 \newfontscript{Malayalam}{mlm2,mlym}
+\newfontscript{Mandaic}{mand}
+\newfontscript{Manichaean}{mani}
+\newfontscript{Marchen}{marc}
 \newfontscript{Math}{math}
+\newfontscript{Meitei~Mayek}{mtei}
+\newfontscript{Mende~Kikakui}{mend}
+\newfontscript{Meroitic~Cursive}{merc}
+\newfontscript{Meroitic~Hieroglyphs}{mero}
+\newfontscript{Miao}{plrd}
+\newfontscript{Modi}{modi}
 \newfontscript{Mongolian}{mong}
+\newfontscript{Mro}{mroo}
+\newfontscript{Multani}{mult}
 \newfontscript{Musical~Symbols}{musc}
-\newfontscript{Myanmar}{mymr}
-\newfontscript{N'ko}{nko~}
+\newfontscript{Myanmar}{mym2,mymr}
+\newfontscript{N'Ko}{nko~}
+\newfontscript{Nabataean}{nbat}
+\newfontscript{Newa}{newa}
+\newfontscript{Odia}{ory2,orya}
 \newfontscript{Ogham}{ogam}
+\newfontscript{Ol~Chiki}{olck}
 \newfontscript{Old~Italic}{ital}
+\newfontscript{Old~Hungarian}{hung}
+\newfontscript{Old~North~Arabian}{narb}
+\newfontscript{Old~Permic}{perm}
 \newfontscript{Old~Persian~Cuneiform}{xpeo}
-\newfontscript{Oriya}{ory2,orya}
+\newfontscript{Old~South~Arabian}{sarb}
+\newfontscript{Old~Turkic}{orkh}
+\newfontscript{Osage}{osge}
 \newfontscript{Osmanya}{osma}
+\newfontscript{Pahawh~Hmong}{hmng}
+\newfontscript{Palmyrene}{palm}
+\newfontscript{Pau~Cin~Hau}{pauc}
 \newfontscript{Phags-pa}{phag}
 \newfontscript{Phoenician}{phnx}
+\newfontscript{Psalter~Pahlavi}{phlp}
+\newfontscript{Rejang}{rjng}
 \newfontscript{Runic}{runr}
+\newfontscript{Samaritan}{samr}
+\newfontscript{Saurashtra}{saur}
+\newfontscript{Sharada}{shrd}
 \newfontscript{Shavian}{shaw}
+\newfontscript{Siddham}{sidd}
+\newfontscript{Sign~Writing}{sgnw}
 \newfontscript{Sinhala}{sinh}
+\newfontscript{Sora~Sompeng}{sora}
 \newfontscript{Sumero-Akkadian~Cuneiform}{xsux}
+\newfontscript{Sundanese}{sund}
 \newfontscript{Syloti~Nagri}{sylo}
 \newfontscript{Syriac}{syrc}
 \newfontscript{Tagalog}{tglg}
 \newfontscript{Tagbanwa}{tagb}
 \newfontscript{Tai~Le}{tale}
 \newfontscript{Tai~Lu}{talu}
+\newfontscript{Tai~Tham}{lana}
+\newfontscript{Tai~Viet}{tavt}
+\newfontscript{Takri}{takr}
 \newfontscript{Tamil}{tml2,taml}
+\newfontscript{Tangut}{tang}
 \newfontscript{Telugu}{tel2,telu}
 \newfontscript{Thaana}{thaa}
 \newfontscript{Thai}{thai}
 \newfontscript{Tibetan}{tibt}
 \newfontscript{Tifinagh}{tfng}
+\newfontscript{Tirhuta}{tirh}
 \newfontscript{Ugaritic~Cuneiform}{ugar}
+\newfontscript{Vai}{vai~}
+\newfontscript{Warang~Citi}{wara}
 \newfontscript{Yi}{yi~~}
+\newfontscript{CJK}{hani}
 \newfontscript{Kana}{kana}
 \newfontscript{Maths}{math}
-\newfontscript{CJK}{hani}
+\newfontscript{N'ko}{nko~}
+\newfontscript{Oriya}{ory2,orya}
 
 \newfontlanguage{Abaza}{ABA}
 \newfontlanguage{Abkhazian}{ABK}
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
index eba6aa99305..ceac6a80f5d 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
@@ -15,8 +15,8 @@ fontspec          = fontspec or {}
 local fontspec    = fontspec
 fontspec.module   = {
     name          = "fontspec",
-    version       = "2.6c",
-    date          = "2017/07/23",
+    version       = "2.6d",
+    date          = "2017/08/14",
     description   = "Font selection for XeLaTeX and LuaLaTeX",
     author        = "Khaled Hosny, Philipp Gesang, Will Robertson",
     copyright     = "Khaled Hosny, Philipp Gesang, Will Robertson",
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
index 5576750a17d..993f4428f6c 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
@@ -13,7 +13,7 @@
 \RequirePackage{expl3}
 \RequirePackage{xparse}
 \ProvidesExplPackage{fontspec}%
-  {2017/07/23}{2.6c}{Font selection for XeLaTeX and LuaLaTeX}
+  {2017/08/14}{2.6d}{Font selection for XeLaTeX and LuaLaTeX}
 \sys_if_engine_luatex:T
   { \RequirePackage{luaotfload}
     \directlua{require("fontspec")}