From: Günter Milde <milde@lyx.org>
Date: Mon, 12 Sep 2016 09:44:45 +0000 (+0200)
Subject: tex2lyx test: make box-color-*.tex sample compilable
X-Git-Tag: 2.3.0alpha1~1034
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=99eeb29e;p=lyx.git

tex2lyx test: make box-color-*.tex sample compilable

Load required package textcomp.
Replace call to non-existent packages textcyr and textgreek with the backup definition of the commands as done by LyX export.
Do not load marvosym (clash with pifont) (LyX does not load the package either).
Remove invalid command \\ascii.
---

diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
index e3f09f4e74..30b5523eed 100644
--- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
+++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
@@ -45,7 +45,7 @@
 \language english
 \language_package none
 \inputencoding iso8859-15
-\fontencoding T1
+\fontencoding T2A,LGR,T1
 \font_roman "cmr" "default"
 \font_sans "berasans" "default"
 \font_typewriter "default" "default"
@@ -2897,21 +2897,7 @@ Characters
 \begin_layout Standard
 
 \size normal
-from package "ascii" and "ifsym": ®
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-{
-\backslash
-ascii
-\backslash
-ETB}
-\end_layout
-
-\end_inset
-
-◻◼ ◙ ◙
+from package "ascii" and "ifsym": ®↨◻◼◙
 \end_layout
 
 \begin_layout Standard
diff --git a/src/tex2lyx/test/box-color-size-space-align.tex b/src/tex2lyx/test/box-color-size-space-align.tex
index eb7de94160..72d4b9de80 100644
--- a/src/tex2lyx/test/box-color-size-space-align.tex
+++ b/src/tex2lyx/test/box-color-size-space-align.tex
@@ -6,7 +6,7 @@
 \usepackage{berasans}
 \renewcommand{\familydefault}{\sfdefault}
 
-\usepackage[T1]{fontenc}
+\usepackage[T2A,LGR,T1]{fontenc}
 \usepackage[latin9]{inputenc}
 
 \usepackage{geometry}
@@ -21,18 +21,17 @@
 \definecolor{note_fontcolor}{rgb}{0, 0, 1}
 \definecolor{shadecolor}{rgb}{1, 1, 0}
 \usepackage{framed}
+\usepackage{textcomp}
 \usepackage{calc}
 \usepackage{fancybox}
 \PassOptionsToPackage{normalem}{ulem}
 \usepackage{ulem}
 \usepackage{ifsym}
 \usepackage{ascii}
-\usepackage{textgreek}
-\usepackage{textcyr}
 \usepackage{subscript}
 \usepackage{tfrupee}
 \usepackage{bbding}
-\usepackage{marvosym}
+%\usepackage{marvosym} % clash with pifont (! \Cross already defined)
 \usepackage{wasysym}
 \usepackage{pifont}
 \usepackage{tipa}
@@ -46,6 +45,13 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LyX specific LaTeX commands.
 \newcommand{\noun}[1]{\textsc{#1}}
+\DeclareRobustCommand{\greektext}{%
+  \fontencoding{LGR}\selectfont\def\encodingdefault{LGR}}
+\DeclareRobustCommand{\textgreek}[1]{\leavevmode{\greektext #1}}
+\ProvideTextCommand{\~}{LGR}[1]{\char126#1}
+\DeclareRobustCommand{\cyrtext}{%
+  \fontencoding{T2A}\selectfont\def\encodingdefault{T2A}}
+\DeclareRobustCommand{\textcyr}[1]{\leavevmode{\cyrtext #1}}
 %% The greyedout annotation environment
 \newenvironment{lyxgreyedout}{\textcolor{note_fontcolor}\bgroup}{\egroup}
 
@@ -508,9 +514,7 @@ smallskip 2:\vspace{\smallskipamount}
 \section{Characters}
 
 from package "ascii" and "ifsym": 
-\textregistered{\ascii\ETB}\textifsymbol[ifgeo]{48}\textifsymbol[ifgeo]{96}
-{\ascii\LF}
-\ascii\LF{}
+\textregistered\ETB\textifsymbol[ifgeo]{48}\textifsymbol[ifgeo]{96}\LF{}
 
 from textcomp: 
 \textnumero\texttrademark