anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-13 06:20:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Increase tex2lyx output format to 405.

Browse Source 
402: Nothing to do (tex2lyx does not support bibtotoc)
403: Nothing to do (the old code already used the new layouts, bug #7780)
404: Nothing to do (write new prettyref syntax)
405: Nothing to do (empty lyx2lyx conversion)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39920 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2011-10-22 17:25:34 +00:00
parent 5bfba3e564
commit 544f5033bf
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tex2lyx/TODO.txt
View File

@ -95,4 +95,7 @@ Format LaTeX feature LyX feature
399 automatic mathdots loading \use_mathdots 399 automatic mathdots loading \use_mathdots
400 other rules than \lyxline InsetLine 400 other rules than \lyxline InsetLine
401 feyn.sty InsetMathDiagram 401 feyn.sty InsetMathDiagram
402 \addcontentsline InsetBibtex bibtotoc option
404 refstyle.sty InsetRef
405 author hash \author

6
src/tex2lyx/preamble.cpp
View File

@ -205,6 +205,8 @@ string h_use_mathdots = "0";
string h_cite_engine = "basic"; string h_cite_engine = "basic";
string h_use_bibtopic = "false"; string h_use_bibtopic = "false";
string h_paperorientation = "portrait"; string h_paperorientation = "portrait";
string h_suppress_date = "false";
string h_use_refstyle = "0";
string h_notefontcolor; string h_notefontcolor;
string h_secnumdepth = "3"; string h_secnumdepth = "3";
string h_tocdepth = "3"; string h_tocdepth = "3";
@ -734,7 +736,9 @@ void end_preamble(ostream & os, TextClass const & /*textclass*/)
<< "\\use_mathdots " << h_use_mathdots << "\n" << "\\use_mathdots " << h_use_mathdots << "\n"
<< "\\cite_engine " << h_cite_engine << "\n" << "\\cite_engine " << h_cite_engine << "\n"
<< "\\use_bibtopic " << h_use_bibtopic << "\n" << "\\use_bibtopic " << h_use_bibtopic << "\n"
<< "\\paperorientation " << h_paperorientation << '\n'; << "\\paperorientation " << h_paperorientation << '\n'
<< "\\suppress_date " << h_suppress_date << '\n'
<< "\\use_refstyle " << h_use_refstyle << '\n';
if (!h_notefontcolor.empty()) if (!h_notefontcolor.empty())
os << "\\notefontcolor " << h_notefontcolor << '\n'; os << "\\notefontcolor " << h_notefontcolor << '\n';
os << h_margins os << h_margins

2
src/tex2lyx/tex2lyx.h
View File

@ -166,7 +166,7 @@ extern bool noweb_mode;
/// Did we recognize any pdflatex-only construct? /// Did we recognize any pdflatex-only construct?
extern bool pdflatex; extern bool pdflatex;
/// LyX format that is created by tex2lyx /// LyX format that is created by tex2lyx
int const LYX_FORMAT = 401; int const LYX_FORMAT = 405;
/// path of the master .tex file /// path of the master .tex file
extern std::string getMasterFilePath(); extern std::string getMasterFilePath();

8
src/tex2lyx/text.cpp
View File

@ -109,6 +109,9 @@ string parse_text_snippet(Parser & p, unsigned flags, const bool outer,
char const * const known_ref_commands[] = { "ref", "pageref", "vref", char const * const known_ref_commands[] = { "ref", "pageref", "vref",
"vpageref", "prettyref", "eqref", 0 }; "vpageref", "prettyref", "eqref", 0 };
char const * const known_coded_ref_commands[] = { "ref", "pageref", "vref",
"vpageref", "formatted", "eqref", 0 };
/*! /*!
* natbib commands. * natbib commands.
* The starred forms are also known except for "citefullauthor", * The starred forms are also known except for "citefullauthor",
@ -2471,7 +2474,10 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
string const opt = p.getOpt(); string const opt = p.getOpt();
if (opt.empty()) { if (opt.empty()) {
context.check_layout(os); context.check_layout(os);
begin_command_inset(os, "ref", t.cs()); char const * const * where = is_known(t.cs(),
known_ref_commands);
begin_command_inset(os, "ref",
known_coded_ref_commands[where - known_ref_commands]);
os << "reference \"" os << "reference \""
<< convert_command_inset_arg(p.verbatim_item()) << convert_command_inset_arg(p.verbatim_item())
<< "\"\n"; << "\"\n";