anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 19:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Increase tex2lyx output format to 410.

Browse Source 
406: Convert noweb layouts to new syntax (untested, see bug #7838)
407: Nothing to do (empty lyx2lyx conversion)
408: Activated the already existing script inset code
409: Nothing to do (tex2lyx does not support XeTeX)
410: Nothing to do (the old code already used the new layouts)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39923 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2011-10-22 19:09:56 +00:00
parent 5a69c96ccd
commit 436a0c13a5
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tex2lyx/TODO.txt
View File

@ -53,7 +53,6 @@ Format LaTeX feature LyX feature
343 ? \use_default_options
347 tabular valign InsetTabular
348 \phantom, \hphantom, \vphantom InsetPhantom
349 XeTeX \use_xetex
350 ? \default_output_format
351 ? \backgroundcolor
353 \printsubindex InsetIndex
@ -98,4 +97,6 @@ Format LaTeX feature LyX feature
402 \addcontentsline InsetBibtex bibtotoc option
404 refstyle.sty InsetRef
405 author hash \author
407 vertical offset for multirows InsetTabular
409 XeTeX \use_non_tex_fonts

2
src/tex2lyx/preamble.cpp
View File

@ -565,7 +565,7 @@ void handle_package(Parser &p, string const & name, string const & opts,
else if (name == "url")
; // ignore this
else if (LYX_FORMAT >= 408 && name == "subscript")
else if (name == "subscript")
; // ignore this
else if (name == "color") {

3
src/tex2lyx/test/test-insets.tex
View File

@ -25,6 +25,7 @@
\usepackage{graphicx}
\usepackage{longtable}
\usepackage{xargs}
\usepackage{subscript}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LyX specific LaTeX commands.
\providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}
@ -35,8 +36,6 @@
\newcommand{\lyxarrow}{\leavevmode\,$\triangleright$\,\allowbreak}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% User specified LaTeX commands.
\usepackage{subscript} % user specified as long as tex2lyx
% produces a format less than 408
\def\mycommand{\textquestiondown}

2
src/tex2lyx/tex2lyx.h
View File

@ -166,7 +166,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 = 405;
int const LYX_FORMAT = 410;
/// path of the master .tex file
extern std::string getMasterFilePath();

9
src/tex2lyx/text.cpp
View File

@ -1495,8 +1495,10 @@ void parse_noweb(Parser & p, ostream & os, Context & context)
os << subst(t.asInput(), "\\", "\n\\backslash\n");
else {
ostringstream oss;
begin_inset(oss, "Newline newline");
end_inset(oss);
Context tmp(false, context.textclass,
&context.textclass[from_ascii("Scrap")]);
tmp.need_end_layout = true;
tmp.check_layout(oss);
os << subst(t.asInput(), "\n", oss.str());
}
// The scrap chunk is ended by an @ at the beginning of a line.
@ -2659,8 +2661,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
skip_spaces_braces(p);
}
else if (LYX_FORMAT >= 408 &&
(t.cs() == "textsuperscript" || t.cs() == "textsubscript")) {
else if ((t.cs() == "textsuperscript" || t.cs() == "textsubscript")) {
context.check_layout(os);
begin_inset(os, "script ");
os << t.cs().substr(4) << '\n';