X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftest%2Fbox-color-size-space-align.tex;h=72d4b9de8004f027136ad52b12e27863ecfa0e52;hb=0d6c64a4eb0a3b6f1e27ba7fd342bf5cff0314a8;hp=e0428fdf7937aa21c5adc7cd088c701863d4e76d;hpb=a47e61e6669239509c3bcce571f330c898396305;p=lyx.git

diff --git a/src/tex2lyx/test/box-color-size-space-align.tex b/src/tex2lyx/test/box-color-size-space-align.tex
index e0428fdf79..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,22 +21,22 @@
 \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}
 \usepackage{tipx}
+\usepackage{xcolor}
 
 \setlength{\parskip}{3mm}
 \setlength{\parindent}{0sp}
@@ -45,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}
 
@@ -96,6 +103,10 @@ blabla \makebox[3cm]{makebox 2} blabla
 
 blabla \makebox[3cm][l]{makebox 3} blabla
 
+\makebox[1\width]{www}
+
+\parbox[t][1\depth]{2.3cm}{www}
+
 \begin{figure}[ht]
   \centering
   \setlength{\unitlength}{.2in}
@@ -119,12 +130,20 @@ blabla \begin{framed}\begin{framed}nested framed\end{framed}\end{framed} blabla
 
 blabla \fbox{fbox} blabla
 
+blabla \framebox{framebox} blabla
+
+\fbox{\begin{minipage}[t]{0.9\columnwidth}%
+fbox around minipage%
+\end{minipage}}
+
 blabla \framebox{fr\textcolor{blue}{ame}box 1} blabla
 
 blabla \framebox[3cm]{framebox 2} blabla
 
 blabla \framebox[3cm][l]{framebox 3} blabla
 
+\framebox[1.5\totalheight]{www}
+
 This is an example text. %
 \framebox{%
 \begin{minipage}[c][1\totalheight][s]{0.2\columnwidth}%
@@ -156,6 +175,52 @@ blabla \doublebox{doublebox} blabla
 
 $\boxed{\int A=B}$
 
+\subsection{Boxes with custom settings}
+
+\fboxsep 35pt
+
+\framebox[1cm]{www}
+
+\fboxsep 20pt \framebox[1cm]{www}
+
+{\fboxsep 1pt \fboxrule 10pt \framebox[1cm]{www}}
+
+{\fboxsep 35pt\shadowsize 15pt\shadowbox{\centering www}}
+
+\parbox[t]{0.9\columnwidth}{%
+\centering www%
+}
+
+{\raggedleft
+\parbox[t]{0.9\columnwidth}{
+\centering www%
+}
+}
+
+\subsection{Color Boxes}
+
+\colorbox{blue}{www}
+
+\colorbox{blue}{\begin{minipage}[t]{0.9\columnwidth}
+www
+\end{minipage}}
+
+\colorbox{blue}{\parbox[t]{0.9\columnwidth}{www}}
+
+\colorbox{blue}{\makebox[0.9\columnwidth][l]{www}}
+
+\fcolorbox{lime}{white}{\begin{minipage}[t]{0.9\columnwidth}%
+www%
+\end{minipage}}
+
+\fcolorbox{lime}{white}{\parbox[t]{0.9\columnwidth}{%
+www%
+}}
+
+\fcolorbox{lime}{white}{\makebox[0.9\columnwidth][l]{www}}
+
+\fcolorbox{lime}{white}{www}
+
 \subsection{LyX Boxes}
 
 \begin{lyxgreyedout}
@@ -175,6 +240,9 @@ Shaded background box, with inner minipage\end{shaded}%
 \subsection{Predefined Colors}
 
 test \textcolor{blue}{blue} test \textcolor{red}{red red red} test \textcolor{green}{bla}\textcolor{magenta}{blub}
+test \textcolor{brown}{brown} test \textcolor{darkgray}{darkgray} test \textcolor{gray}{gray}\textcolor{lightgray}{lightgray}
+test \textcolor{lime}{lime} test \textcolor{olive}{olive} test \textcolor{orange}{orange}\textcolor{pink}{pink}
+test \textcolor{purple}{purple} test \textcolor{teal}{teal} test \textcolor{violet}{violet}
 test
 \textcolor{green}{c}%
 \textcolor{red}{o}%
@@ -357,7 +425,9 @@ Lines can have a left arrow fill \leftarrowfill in the middle.
 Lines can have a right arrow fill \rightarrowfill in the middle.
 Lines can have a upbrace fill \upbracefill in the middle.
 Lines can have a downbrace fill \downbracefill in the middle.
-Lines can have space \hspace{2cm} in the middle.
+Lines can have an absolute space \hspace{2cm} in the middle.
+Lines can have a relative space \hspace{0.12\textwidth} in the middle.
+Lines can have a glue-length space \hspace{2cm plus 2mm minus 1mm} in the middle.
 Lines can have protected space \hspace*{2cm} in the middle.
 
 We also handle defined spaces:
@@ -421,7 +491,9 @@ interword: $a\ b$
 Lines can have a vfill \vfill in the middle.
 Lines can have a vfill \vspace{\fill} in the middle.
 Lines can have a protected vfill \vspace*{\fill} in the middle.
-Lines can have vertical space \vspace{2cm} in the middle.
+Lines can have a vertical absolute space \vspace{2cm} in the middle.
+Lines can have a vertical relative space \vspace{0.09\columnwidth} in the middle.
+Lines can have a vertical glue-length space \vspace{2cm minus 2bp plus 1cc} in the middle.
 Lines can have protected vertical space \vspace*{2cm} in the middle.
 
 We also handle skips:
@@ -442,15 +514,13 @@ 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
 
 from textgreek and textcyr:
-\textgreek{>a}\textcyr{\char226}
+\textgreek{>a}\textcyr{\cyrv}
 
 from subscript:
 \textsubscript{4}