From ce4c8e64ee6752418d0d83567f3d8dd13f7a8fc2 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sat, 22 Oct 2011 11:11:50 +0000 Subject: [PATCH] Increase tex2lyx output format to 398. 394: Added use_makebox parameter to InsetBox 395: Nothing to do (empty lyx2lyx conversion) 396: Nothing to do (empty lyx2lyx conversion) 397: Nothing to do (tex2lyx does not support nameref) 398: Nothing to do (empty lyx2lyx conversion) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39916 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/tex2lyx/TODO.txt | 3 +++ src/tex2lyx/tex2lyx.h | 2 +- src/tex2lyx/text.cpp | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt index 9c564b583e..19ceca7dec 100644 --- a/src/tex2lyx/TODO.txt +++ b/src/tex2lyx/TODO.txt @@ -89,4 +89,7 @@ Format LaTeX feature LyX feature 390 forward/reverse search \forward_search, \forward_macro 391 decimal alignment in tables InsetTabular 392 new beamer format InsetLayout +394 \makebox InsetBox use_makebox +395 page sizes C0-6 \papersize +396 nameref.sty InsetRef diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h index 9d0e4a1923..8db4dcf653 100644 --- a/src/tex2lyx/tex2lyx.h +++ b/src/tex2lyx/tex2lyx.h @@ -165,7 +165,7 @@ extern bool noweb_mode; /// Did we recognize any pdflatex-only construct? extern bool pdflatex; /// LyX format that is created by tex2lyx -int const LYX_FORMAT = 393; +int const LYX_FORMAT = 398; /// path of the master .tex file extern std::string getMasterFilePath(); diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp index 1f2d542014..85df00324a 100644 --- a/src/tex2lyx/text.cpp +++ b/src/tex2lyx/text.cpp @@ -866,6 +866,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags, os << "has_inner_box " << !inner_type.empty() << "\n"; os << "inner_pos \"" << inner_pos << "\"\n"; os << "use_parbox " << (inner_type == "parbox") << '\n'; + os << "use_makebox 0\n"; os << "width \"" << width_value << width_unit << "\"\n"; os << "special \"none\"\n"; os << "height \"" << height_value << height_unit << "\"\n";