summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/fontspec
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-09 23:44:31 +0000
committerKarl Berry <karl@freefriends.org>2017-11-09 23:44:31 +0000
commitd58e09051eed105b7c4b93a513e0fd02ae2dfd4b (patch)
treeaa46d20a14160b1e582040da11625b63fb269bd8 /Master/texmf-dist/doc/latex/fontspec
parent99faba785d6e66859a2b9ab1d49e7f3c0db491af (diff)
fontspec (9nov17)
git-svn-id: svn://tug.org/texlive/trunk@45732 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/fontspec')
-rw-r--r--Master/texmf-dist/doc/latex/fontspec/CHANGES.md8
-rw-r--r--Master/texmf-dist/doc/latex/fontspec/README.md14
-rw-r--r--Master/texmf-dist/doc/latex/fontspec/fontspec-code.ltx44
-rw-r--r--Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdfbin589280 -> 611647 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontspec/fontspec.ltx47
-rw-r--r--Master/texmf-dist/doc/latex/fontspec/fontspec.pdfbin686287 -> 686522 bytes
6 files changed, 8 insertions, 105 deletions
diff --git a/Master/texmf-dist/doc/latex/fontspec/CHANGES.md b/Master/texmf-dist/doc/latex/fontspec/CHANGES.md
index 8870ac5b9b1..7a8a0760bcd 100644
--- a/Master/texmf-dist/doc/latex/fontspec/CHANGES.md
+++ b/Master/texmf-dist/doc/latex/fontspec/CHANGES.md
@@ -2,6 +2,14 @@
Change history
==============
+- v2.6g (2017-11-09)
+
+ * Bugfix for clash introduced with last version. When loading `babel`
+ before `fontspec` the following error arose:
+
+ ! Control sequence \latinencoding already defined.
+
+
- v2.6f (2017-11-05)
* Fix loading of Graphite fonts and add a little documentation (a better interface is needed, though)
diff --git a/Master/texmf-dist/doc/latex/fontspec/README.md b/Master/texmf-dist/doc/latex/fontspec/README.md
index 77e00a69132..cd01b539d8b 100644
--- a/Master/texmf-dist/doc/latex/fontspec/README.md
+++ b/Master/texmf-dist/doc/latex/fontspec/README.md
@@ -81,17 +81,3 @@ local texmf tree. Depending how your TeX distribution is configured
you may then need to update the filename database with `texhash`.
-
-License
--------
-
-Copyright 2004--2017 Will Robertson <will.robertson@latex-project.org>
-Copyright 2009--2010 Khaled Hosny <khaledhosny@eglug.org>
-
-Distributable under the LaTeX Project Public License,
-version 1.3c or higher (your choice). The latest version of
-this license is at: http://www.latex-project.org/lppl.txt
-
-This work is "maintained" (as per LPPL maintenance status)
-by Will Robertson.
-
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-code.ltx b/Master/texmf-dist/doc/latex/fontspec/fontspec-code.ltx
deleted file mode 100644
index 5b1e400de1b..00000000000
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec-code.ltx
+++ /dev/null
@@ -1,44 +0,0 @@
-%%^^A%% fontspec-code.ltx -- part of FONTSPEC <wspr.io/fontspec>
-
-\documentclass[a4paper]{l3doc}
-\usepackage{fontspec-doc-style}
-\begin{document}
-
-\GetFileInfo{fontspec.dtx}
-\title{The \textsf{fontspec} package\\Font selection for \XeLaTeX\ and \LuaLaTeX}
-\author{
- \textsc{Will Robertson} and \textsc{Khaled Hosny}\\
- \url{http://wspr.io/fontspec/}
-}
-\date{\filedate \qquad \fileversion}
-
-\maketitle
-\tableofcontents
-\newpage
-
-\def\DTX#1{\DocInput{#1}}
-\FONTSPECDTX
-
-\clearpage
-\PrintChanges
-
-\clearpage
-\setcounter{IndexColumns}{2}
-\PrintIndex
-
-\end{document}
-
-\endinput
-
-% /©
-% ------------------------------------------------
-% The FONTSPEC package <wspr.io/fontspec>
-% ------------------------------------------------
-% Copyright 2004-2017 Will Robertson, LPPL "maintainer"
-% Copyright 2009-2013 Khaled Hosny
-% ------------------------------------------------
-% This package is free software and may be redistributed and/or modified under
-% the conditions of the LaTeX Project Public License, version 1.3c or higher
-% (your choice): <http://www.latex-project.org/lppl/>.
-% ------------------------------------------------
-% ©/
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf
index 529af944e11..fe889558f00 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.ltx b/Master/texmf-dist/doc/latex/fontspec/fontspec.ltx
deleted file mode 100644
index c1eeeecdc9b..00000000000
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec.ltx
+++ /dev/null
@@ -1,47 +0,0 @@
-%%^^A%% fontspec.ltx -- part of FONTSPEC <wspr.io/fontspec>
-
-\ifdefined \XeTeXOTcountscripts \else \makeatletter
- \@latex@error{^^J*** The fontspec documentation can only be typeset with `xelatex` ***\@gobble}\@ehc
-\fi
-
-\documentclass[a4paper]{l3doc}
-\usepackage{fontspec-doc-style}
-\begin{document}
-
-\GetFileInfo{fontspec.dtx}
-\title{The \textsf{fontspec} package\\Font selection for \XeLaTeX\ and \LuaLaTeX}
-\author{
- \textsc{Will Robertson} and \textsc{Khaled Hosny}\\
- \url{http://wspr.io/fontspec/}
-}
-\date{\filedate \qquad \fileversion}
-
-\maketitle
-\tableofcontents
-\newpage
-
-\include{fontspec-doc-intro}
-\include{fontspec-doc-fontsel}
-\include{fontspec-doc-featset}
-\include{fontspec-doc-opentype}
-\include{fontspec-doc-enc}
-\include{fontspec-doc-luatex}
-\include{fontspec-doc-xetex}
-\include{fontspec-doc-api}
-
-\end{document}
-
-\endinput
-
-% /©
-% ------------------------------------------------
-% The FONTSPEC package <wspr.io/fontspec>
-% ------------------------------------------------
-% Copyright 2004-2017 Will Robertson, LPPL "maintainer"
-% Copyright 2009-2013 Khaled Hosny
-% ------------------------------------------------
-% This package is free software and may be redistributed and/or modified under
-% the conditions of the LaTeX Project Public License, version 1.3c or higher
-% (your choice): <http://www.latex-project.org/lppl/>.
-% ------------------------------------------------
-% ©/
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
index d9cbbffc32f..5e9584724d4 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
Binary files differ