From 32b47e975eda97e75590294467a87570653e1bfb Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnter=20Milde?= <milde@lyx.org>
Date: Wed, 27 Mar 2019 17:09:12 +0100
Subject: [PATCH] Fix settings for Hebrew with 8-bit TeX fonts.

---
 autotests/export/latex/he-scrarticle.lyx | 150 +++++++++++++++++++++++
 lib/languages                            |  12 +-
 2 files changed, 159 insertions(+), 3 deletions(-)
 create mode 100644 autotests/export/latex/he-scrarticle.lyx

diff --git a/autotests/export/latex/he-scrarticle.lyx b/autotests/export/latex/he-scrarticle.lyx
new file mode 100644
index 0000000000..9124c6b410
--- /dev/null
+++ b/autotests/export/latex/he-scrarticle.lyx
@@ -0,0 +1,150 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 569
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass scrartcl
+\begin_preamble
+
+\end_preamble
+\use_default_options false
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding auto
+\fontencoding auto
+\font_roman "lmodern" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment class
+\paperfontsize default
+\spacing single
+\use_hyperref true
+\pdf_bookmarks false
+\pdf_bookmarksnumbered false
+\pdf_bookmarksopen false
+\pdf_bookmarksopenlevel 1
+\pdf_breaklinks false
+\pdf_pdfborder true
+\pdf_colorlinks true
+\pdf_backref section
+\pdf_pdfusetitle true
+\papersize a4paper
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 0
+\use_minted 0
+\index Stichwortverzeichnis
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tablestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+Package clash Babel-Hebrew — Koma-Article (and other non-standard article
+ classes).
+\end_layout
+
+\begin_layout Standard
+Without a dummy definition in lib/languages, there is an error:
+\end_layout
+
+\begin_layout LyX-Code
+rlbabel.def (l.418): 
+\backslash
+l@chapter undefined
+\end_layout
+
+\begin_layout Standard
+
+\lang hebrew
+עִבְרִית היא שפה שמית, ממשפחת השפות האפרו-אסיאתיות, הידועה כשפתם של היהודים
+ ושל השומרונים, אשר ניב מודרני שלה (עברית ישראלית) הוא שפתה הרשמית של מדינת
+ ישראל, מעמד שעוגן בשנת
+\family roman
+\series medium
+\shape up
+\size normal
+\emph off
+\nospellcheck off
+\bar no
+\strikeout off
+\xout off
+\uuline off
+\uwave off
+\noun off
+\color none
+ 
+\family default
+\series default
+\shape default
+\size default
+\emph default
+\numeric on
+\nospellcheck default
+\bar default
+\strikeout default
+\xout default
+\uuline default
+\uwave default
+\noun default
+\color inherit
+2018
+\numeric off
+ בחוק יסוד: ישראל – מדינת הלאום של העם היהודי.
+\end_layout
+
+\end_body
+\end_document
diff --git a/lib/languages b/lib/languages
index 20b3a7415e..3134d160d3 100644
--- a/lib/languages
+++ b/lib/languages
@@ -754,9 +754,15 @@ Language hebrew
 	Encoding          cp1255
 	QuoteStyle        english
 	InternalEncoding  true
-# Hebrew babel loads the font encodings
-# itself in the appropriate order
-#	FontEncoding      LHE
+	# babel-hebrew expects the encoding for *other* languages last:
+	# FontEncoding      HE8
+	# Define the font encoding the babel-hebrew way and
+	# work around too simple test for article-like classes in rlbabel.def.
+	PreBabelPreamble
+	  \def\HeblatexEncoding{HE8}
+	  \def\HeblatexEncodingFile{he8enc}
+	  \providecommand{\l@chapter}{\relax}
+	EndPreBabelPreamble
 	DateFormats      "d MMMM yyyy|d MMM yyyy|dd/MM/yyyy"
 	RTL               true
 	LangCode          he_IL
-- 
2.39.2