Remove Latex tag from linuxdoc and docbook related layout files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2839 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
José Matox 2001-10-03 17:28:08 +00:00
parent afb64cfd01
commit 98cd1026da
7 changed files with 41 additions and 37 deletions

View File

@ -1,3 +1,11 @@
2001-10-03 José Matos <jamatos@fep.up.pt>
* layouts/linuxdoc.layout:
* layouts/manpage.layout:
* layouts/db_lyxmacros.inc:
* layouts/db_stdlayouts.inc: remove bogus use of the now defunct
Latex tag.
2001-10-03 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* languages: change default encoding for estonian to latin1

View File

@ -13,11 +13,7 @@ Style Code
LatexType Environment
LatexName programlisting
LatexParam CDATA
Preamble
EndPreamble
Font
Latex Latex
EndFont
PassThru 1
End
# Comment style definition

View File

@ -9,19 +9,25 @@ Input stdlayouts.inc
# SGML style definition
Style SGML
CopyStyle LaTeX
LatexName "!-- --"
Margin Static
LatexType Paragraph
LatexName "!-- --"
NewLine 0
ParIndent MM
ParSkip 0.4
ParSep 0.5
Align Left
AlignPossible Block
LabelType No_Label
FreeSpacing 1
PassThru 1
End
NoStyle LaTeX
# Verbatim style definition
Style Literal
LatexType Environment
LatexName literallayout
Font
Latex Latex
EndFont
PassThru 1
End
# Quote style definition

View File

@ -378,9 +378,5 @@ Style SGML
AlignPossible Block, Left, Right, Center
LabelType No_Label
FreeSpacing 1
# standard font definition
Font
Latex Latex
EndFont
PassThru 1
End

View File

@ -170,18 +170,14 @@ End
Style SGML
Margin Static
LatexType Paragraph
LatexName dummy
LatexName "!-- --"
NewLine 0
ParIndent MM
ParSkip 0.4
ParSep 0.5
Align Left
AlignPossible Block, Left, Right, Center
AlignPossible Block
LabelType No_Label
FreeSpacing 1
# standard font definition
Font
Latex Latex
EndFont
PassThru 1
End

View File

@ -1,3 +1,7 @@
2001-10-03 José Matos <jamatos@fep.up.pt>
* buffer.C (simpleDocBookOnePar): add support for pass_thru.
2001-10-03 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* .cvsignore: update

View File

@ -3361,20 +3361,18 @@ void Buffer::simpleDocBookOnePar(ostream & os, string & extra,
}
} else {
string sgml_string;
if (par->linuxDocConvertChar(c, sgml_string)
&& !style.free_spacing) { // in freespacing
// mode, spaces are
// non-breaking characters
// char is ' '
if (desc_on == 1) {
++char_line_count;
os << "\n</term><listitem><para>";
desc_on = 2;
} else {
os << c;
}
par->linuxDocConvertChar(c, sgml_string);
if (style.pass_thru) {
os << c;
} else if(style.free_spacing || c != ' ') {
os << sgml_string;
} else if (desc_on ==1) {
++char_line_count;
os << "\n</term><listitem><para>";
desc_on = 2;
} else {
os << sgml_string;
os << ' ';
}
}
font_old = font;