Increase tex2lyx output format to 368.

357: Added comment about \underbar and \ulem
358: Nothing to do (empty lyx2lyx conversion)
359: Nothing to do (empty lyx2lyx conversion)
360: Nothing to do (empty lyx2lyx conversion)
361: Nothing to do (empty lyx2lyx conversion)
362: Nothing to do (empty lyx2lyx conversion)
363: Nothing to do (empty lyx2lyx conversion)
364: Nothing to do (empty lyx2lyx conversion)
365: Nothing to do (empty lyx2lyx conversion)
366: Nothing to do (empty lyx2lyx conversion)
367: Nothing to do (empty lyx2lyx conversion)
368: Nothing to do (empty lyx2lyx conversion)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39910 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2011-10-21 19:57:03 +00:00
parent 60a162888d
commit 081fb1c4d8
3 changed files with 15 additions and 1 deletions

View File

@ -60,4 +60,15 @@ Format LaTeX feature LyX feature
354 \printindex*, \printsubindex* InsetIndex 354 \printindex*, \printsubindex* InsetIndex
355 \sout fonts 355 \sout fonts
356 \uuline, \uwave fonts 356 \uuline, \uwave fonts
358 custom bibtex command \bibtex_command
358 custom makeindex command \index_command
359 set_width InsetCommand nomencl_print
360 width InsetCommand nomencl_print
362 applemac encoding \encoding
363 horizontal longtable alignment InsetTabular
364 branch file name suffix \filename_suffix
365 custom paragraph indentation \paragraph_indentation
366 relative lengths for parskip \defskip
367 relative lengths for h and v space InsetHSpace, InsetVSpace
368 glue lengths InsetHSpace

View File

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

View File

@ -2404,6 +2404,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
} }
else if (t.cs() == "underbar" || t.cs() == "uline") { else if (t.cs() == "underbar" || t.cs() == "uline") {
// \underbar is not 100% correct (LyX outputs \uline
// of ulem.sty). The difference is that \ulem allows
// line breaks, and \underbar does not.
// Do NOT handle \underline. // Do NOT handle \underline.
// \underbar cuts through y, g, q, p etc., // \underbar cuts through y, g, q, p etc.,
// \underline does not. // \underline does not.