This patch adds LaTeX code to make sure that the columns in an RTL document are
also ordered RTL.
Objections or comments ?
---
src/BufferParams.cpp | 3 +++
src/LaTeXFeatures.cpp | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 0a7e594..64aab6e 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1157,6 +1157,9 @@ void BufferParams::validate(LaTeXFeatures & features)
const
{
features.require(documentClass().requires());
+ if (columns > 1 && language->rightToLeft())
+ features.require("rtloutputdblcol");
+
if (outputChanges) {
bool dvipost = LaTeXFeatures::isAvailable("dvipost");
bool xcolorulem = LaTeXFeatures::isAvailable("ulem") &&
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 2a3d099..550ab29 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -276,6 +276,42 @@ static docstring const lyxref_def = from_ascii(
" {\\def\\RSlemtxt{lemma~}\\newref{lem}{name = \\RSlemtxt}}\n"
" {}\n");
+// Make sure the columns are also outputed as rtl
+static docstring const rtloutputdblcol_def = from_ascii(
+ "\\def\\@outputdblcol{%\n"
+ " \\if@firstcolumn\n"
+ " \\global \\@firstcolumnfalse\n"
+ " \\global \\setbox\\@leftcolumn \\box\\@outputbox\n"
+ " \\else\n"
+ " \\global \\@firstcolumntrue\n"
+ " \\setbox\\@outputbox \\vbox {%\n"
+ " \\hb@xt@\\textwidth {%\n"
+ " \\kern\\textwidth \\kern-\\columnwidth %**\n"
+ " \\hb@xt@\\columnwidth {%\n"
+ " \\box\\@leftcolumn \\hss}%\n"
+ " \\kern-\\textwidth %**\n"
+ " \\hfil\n"
+ " {\\normalcolor\\vrule \\@width\\columnseprule}%\n"
+ " \\hfil\n"
+ " \\kern-\\textwidth %**\n"
+ " \\hb@xt@\\columnwidth {%\n"
+ " \\box\\@outputbox \\hss}%\n"
+ " \\kern-\\columnwidth \\kern\\textwidth %**\n"
+ " }%\n"
+ " }%\n"
+ " \\@combinedblfloats\n"
+ " \\@outputpage\n"
+ " \\begingroup\n"
+ " \\@dblfloatplacement\n"
+ " \\@startdblcolumn\n"
+ " \\@whilesw\\if@fcolmade \\fi\n"
+ " {\\@outputpage\n"
+ " \\@startdblcolumn}%\n"
+ " \\endgroup\n"
+ " \\fi\n"
+ "}\n"
+ "\\@mparswitchtrue\n");
+
/////////////////////////////////////////////////////////////////////
//
@@ -997,6 +1033,9 @@ docstring const LaTeXFeatures::getMacros() const
if (mustProvide("ct-none"))
macros << changetracking_none_def;
+ if (mustProvide("rtloutputdblcol"))
+ macros << rtloutputdblcol_def;
+
return macros.str();
}
--
1.7.9.msysgit.0
