From aabd14676b7c006a93f55886fbe105a76ddbc8fd Mon Sep 17 00:00:00 2001
From: mb21 <mb21@users.noreply.github.com>
Date: Thu, 20 Aug 2015 17:27:28 +0200
Subject: [PATCH] LaTeX, ConTeXt: more specific language variables

---
 default.context | 4 ++--
 default.latex   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/default.context b/default.context
index d09ecb40f..c9b4936fb 100644
--- a/default.context
+++ b/default.context
@@ -2,8 +2,8 @@
   \enableregime[utf-8]  
   \setupcolors[state=start]
 \stopmode
-$if(mainlang)$
-\mainlanguage[$mainlang$]
+$if(context-lang)$
+\mainlanguage[$context-lang$]
 $endif$
 
 % Enable hyperlinks
diff --git a/default.latex b/default.latex
index 26684135d..bfb2e3094 100644
--- a/default.latex
+++ b/default.latex
@@ -1,4 +1,4 @@
-\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$lang$,$endif$$if(papersize)$$papersize$,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}
+\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(papersize)$$papersize$,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}
 $if(fontfamily)$
 \usepackage{$fontfamily$}
 $else$
@@ -74,10 +74,10 @@ $endif$
 $if(lang)$
 \ifxetex
   \usepackage{polyglossia}
-  \setmainlanguage{$mainlang$}
-  \setotherlanguages{$for(otherlang)$$otherlang$$sep$,$endfor$}
+  \setmainlanguage[variant=$polyglossia-variant$]{$polyglossia-lang$}
+  \setotherlanguages{$for(polyglossia-otherlangs)$$polyglossia-otherlangs$$sep$,$endfor$}
 \else
-  \usepackage[shorthands=off,$lang$]{babel}
+  \usepackage[shorthands=off,$babel-lang$]{babel}
 \fi
 $endif$
 $if(natbib)$