From 6ea3ea065d72f1dd1229cd1ab37be377019501ad Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 22 May 2014 22:00:35 +0000
Subject: polyglossia (22may14)

git-svn-id: svn://tug.org/texlive/trunk@34205 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex')

diff --git a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex
index 96f4d91c762..bed5fcdaea5 100644
--- a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex
+++ b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex
@@ -373,6 +373,15 @@ the font, by means of \pkg{fontspec}’s \cmd\addfontfeature. If the current fon
 does not appear to support the script of that language, an error message is
 displayed.
 
+\section{Hyphenation disabling}
+
+In some very specific contexts (such as music score creation), \TeX{} hyphenation
+is something to avoid as it may cause troubles. \pkg{polyglossia} provides two
+functions: \cmd\disablehyphenation and \cmd\enablehyphenation . Note that when
+you select a new language, hyphenation will be in the same state (enabled or
+disabled) as before. When you reenable it, it will take the last selected
+language.
+
 \section{Language-specific options and commands}\label{specific}
 
 This section gives a list of all languages for which options and end-user commands are defined.
@@ -478,6 +487,8 @@ The default value of each option is given in italic.
 \subsection{german}\label{german}
 \textbf{Options}:
 	\begin{itemize}
+	\item\TB{variant} = \textit{german} or austrian.\new{v1.33.4}
+		Setting variant=austrian uses some austrian lexical variants.
 	\item \TB{spelling} = \textit{new} (= 1996) or old (= 1901):
 		indicates whether hyphenation patterns for traditional (1901) or reformed
 		(1996) orthography should be used. The latter is the default.
@@ -507,8 +518,8 @@ The default value of each option is given in italic.
 		\item  ¦"<¦ for French left double quotes («)
 		\item  ¦">¦ for French right double quotes (»).
 		\end{itemize}
-  \item\TB{script} = \textit{latin} or fraktur.\new{v1.2.0}
-    Setting script=fraktur modifies the captions for typesetting German in Fraktur.
+	\item\TB{script} = \textit{latin} or fraktur.\new{v1.2.0}
+		Setting script=fraktur modifies the captions for typesetting German in Fraktur.
 	\end{itemize}
 
 \subsection{greek}\label{greek}
-- 
cgit v1.2.3

