X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flanguages;h=76652f965465f8f6331afb738c216049b9b98639;hb=39a28b4b27af761c7b04fe86eee89c19e2dac5d5;hp=bcaf88240cd5f1fa337c2a47aee327501f3861ed;hpb=aa141bc293916ee3a7676549a7a2d8a7d2393fd7;p=lyx.git

diff --git a/lib/languages b/lib/languages
index bcaf88240c..76652f9654 100644
--- a/lib/languages
+++ b/lib/languages
@@ -57,6 +57,7 @@
 #   - french:	  <<text>>		``text''	(outward guillemets -- 66_99)
 #   - frenchin:   <<text>>		<<text>>	(French Imprimerie Nationale style)
 #   - german:	  ,,text``		,text`		(99/66 -- 9/6)
+#   - hungarian:  ,,text''		>>text<<	(99/99 -- double inward guillemets)
 #   - polish:	  ,,text''		,text'		(99/99 -- 9/9)
 #   - russian:    <<text>>		,,text``       	(outward guillemets -- 99/66)
 #   - swedish:	  ''text''		'text'		(99_99 -- 9_9)
@@ -122,7 +123,7 @@
 #   but are available globally if this language is used (not only for this
 #   language. Examples are \textgreek (Greek) and \textcyrillic (Russian).
 # * ActiveChars provides a string of the characters that are made active
-#   by the language. We record particularly those characters that have to 
+#   by the language. We record particularly those characters that have to
 #   be de-activated in some contexts (such as - or =).
 # * XindyName holds the value to the (te)xindy -L option. We only give it
 #   if a corresponding language module exists.
@@ -1064,24 +1065,35 @@ Language latvian
 	LangCode         lv_LV
 End
 
-# lithuanian must be loaded locally with babel options,
-# not globally via class options
-# FontEncoding: L7x set by Babel
+# FontEncoding: L7x required for hyphenation but no longer set by Babel
+# (since 2017-12-06)
 Language lithuanian
 	GuiName          "Lithuanian"
 	BabelName        lithuanian
 	PolyglossiaName  lithuanian
-	XindyName        lithunian
+	XindyName        lithuanian
 	QuoteStyle       german
 	Encoding         iso8859-13
 	FontEncoding     L7x
 	# L7x defines \copyright as TextSymbol which leads to an endless loop
-        # when it is used in other font encodings.
+	# when it is used in other font encodings.
 	PostBabelPreamble
-	  % restore \coyright definition corrupted by l7xenc.def
-          \DeclareRobustCommand{\copyright}{%
-            \ifmmode{\nfss@text{\textcopyright}}\else\textcopyright\fi}
-	    \addto\noextraslithuanian{\latintext}
+	  \@ifl@aded{def}{l7xenc}{
+	    % restore corrupted \coyright definition
+	    \DeclareRobustCommand{\copyright}{%
+	      \ifmmode{\nfss@text{\textcopyright}}\else\textcopyright\fi
+	    }
+	    % Switch to L7x and back
+	    \addto\extraslithuanian{
+	      \let\bbl@lithuanian@cfencoding\cf@encoding
+	      \fontencoding{L7x}\selectfont
+	      \def\encodingdefault{L7x}
+	    }
+	    \addto\noextraslithuanian{
+	      \def\encodingdefault{\bbl@lithuanian@cfencoding}
+	      \fontencoding{\encodingdefault}\selectfont
+	    }  
+	  }{}
 	EndPostBabelPreamble
 	DateFormats      "yyyy 'm.' MMMM d 'd.'|yyyy 'm.' MMMM d 'd.'|yyyy-MM-dd"
 	LangCode         lt_LT
@@ -1105,7 +1117,7 @@ Language magyar
 	BabelName        magyar
 	PolyglossiaName  magyar
 	XindyName        hungarian
-	QuoteStyle       polish
+	QuoteStyle       hungarian
 	Encoding         iso8859-2
 	FontEncoding	 T1|OT1
 	DateFormats      "yyyy. MMMM d.|yyyy. MMM d.|yyyy.MM.dd."