+2001-01-28 José Matos <jamatos@fep.up.pt>
+
+ * layouts/db_lyxmacros.inc
+ * layouts/db_stdclass.inc
+ * layouts/db_stdlayouts.inc
+ * layouts/db_stdlists.inc
+ * layouts/db_stdsections.inc
+ * layouts/db_stdstarsections.inc
+ * layouts/db_stdstruct.inc
+ * layouts/db_stdtitle.inc: new files with modular support
+ for docbook.
+
+ * layouts/docbook-chapter.layout
+ * layouts/docbook-section.layout: new files, useful for
+ document inclusion.
+
+ * layouts/docbook.layout
+ * layouts/docbook-book.layout: updated to use the modular support.
+
2001-01-28 Dekel Tsur <dekelts@tau.ac.il>
* ui/default.ui: Move the Bookmarks submenu to the Navigate menu.
--- /dev/null
+# Textclass definition file for docbook.
+# Author : José Abílio Oliveira Matos <jamatos@lyx.org>
+
+# This is the counterpart of lyxmacros.inc
+# It is desireable, as far as possible, to have the same look and feeling for
+# related layouts in latex and docbook.
+
+Input lyxmacros.inc
+
+# Code style definition
+Style Code
+ CopyStyle LyX-Code
+ LatexType Environment
+ LatexName programlisting
+ LatexParam CDATA
+ Preamble
+ EndPreamble
+ Font
+ Latex Latex
+ EndFont
+End
+
+# Comment style definition
+Style Comment
+ LatexType Paragraph
+ LatexName comment
+End
+
+Style LyX-Code
+ ObsoletedBy Code
+End
+
+NoStyle LyX-Code
+
+NoStyle Address
+
+NoStyle Right_Address
\ No newline at end of file
--- /dev/null
+# Textclass definition file for docbook.
+# Author : José Abílio Oliveira Matos <jamatos@lyx.org>
+
+# This file is the counterpart of stdclass.inc
+# It is desireable, as far as possible, to have the same look and feeling for
+# related layouts in latex and docbook.
+
+OutputType docbook
+
+# General textclass parameters
+Columns 1
+Sides 1
+SecNumDepth 3
+TocDepth 3
+
+# This is just to show how to declare the default font.
+# The defaults are exactly those shown here.
+DefaultFont
+ Family Roman
+ Series Medium
+ Shape Up
+ Size Normal
+ Color None
+EndFont
+
+# Standard style definition
+Style Standard
+ Margin Static
+ LatexType Paragraph
+ LatexName para
+ ParIndent MM
+ ParSkip 0.4
+ Align Block
+ AlignPossible Block
+ LabelType No_Label
+End
+
+Input db_stdlists.inc
+Input db_stdsections.inc
+Input db_stdstarsections.inc
+Input db_stdtitle.inc
+Input db_stdstruct.inc
+Input db_lyxmacros.inc
+Input db_stdlayouts.inc
--- /dev/null
+# Textclass definition file for docbook.
+# Author : José Abílio Oliveira Matos <jamatos@lyx.org>
+
+# This is the counterpart of stdlayouts.inc
+# It is desireable, as far as possible, to have the same look and feeling for
+# related layouts in latex and docbook.
+
+Input stdlayouts.inc
+
+# SGML style definition
+Style SGML
+ CopyStyle LaTeX
+ LatexName "!-- --"
+End
+
+NoStyle LaTeX
+
+# Verbatim style definition
+Style Literal
+ LatexType Environment
+ LatexName literallayout
+ Font
+ Latex Latex
+ EndFont
+End
+
+# Quote style definition
+Style Quotation
+ LatexType Environment
+ LatexName blockquote
+ LatexParam para
+End
+
+# Quote should be an inline element
+NoStyle Quote
+
+NoStyle Verse
+
+Style Caption
+ LatexType Paragraph
+ LatexName caption
+End
\ No newline at end of file
--- /dev/null
+# Textclass definition file for docbook.
+# Author : José Abílio Oliveira Matos <jamatos@lyx.org>
+
+# This is the counterpart of stdlists.inc
+# It is desireable, as far as possible, to have the same look and feeling for
+# related layouts in latex and docbook.
+
+Input stdlists.inc
+
+# Itemize style definition
+Style Itemize
+ LatexType Item_Environment
+ LatexName itemizedlist
+End
+
+# Enumerate style definition
+Style Enumerate
+ LatexType Item_Environment
+ LatexName orderedlist
+End
+
+# Description style definition
+Style Description
+ LatexType Item_environment
+ LatexName variablelist
+End
+
+# maybe List is the same as simplelist (I need to check it).
+NoStyle List
+
--- /dev/null
+# Textclass definition file for docbook.
+# Author : José Abílio Oliveira Matos <jamatos@lyx.org>
+
+# This file is the counterpart of stdsections.inc
+# It is desireable, as far as possible, to have the same look and feeling for
+# related layouts in latex and docbook.
+
+Input stdsections.inc
+
+# Part style definition
+Style Part
+ LatexType Command
+ LatexName part
+ LatexParam "0|"
+End
+
+# Chapter style definition
+Style Chapter
+ LatexType Command
+ LatexName chapter
+ LatexParam "1|"
+End
+
+# Section style definition
+Style Section
+ LatexType Command
+ LatexName sect1
+ LatexParam "2|"
+End
+
+# Subsection style definition
+Style Subsection
+ LatexType Command
+ LatexName sect2
+ LatexParam "3|"
+End
+
+# Subsubsection style definition
+Style Subsubsection
+ LatexType Command
+ LatexName sect3
+ LatexParam "4|"
+End
+
+# Paragraph style definition
+Style Paragraph
+ LatexType Command
+ LatexName sect4
+ LatexParam "5|"
+End
+
+# Subparagraph style definition
+Style Subparagraph
+ LatexType Command
+ LatexName sect5
+ LatexParam "6|"
+End
+
--- /dev/null
+# Textclass definition file for docbook.
+# Author : José Abílio Oliveira Matos <jamatos@lyx.org>
+
+# This file is the counterpart of stdstarsections.inc
+# It is desireable, as far as possible, to have the same look and feeling for
+# related layouts in latex and docbook.
+
+# empty for now, it is possible to do it using bridgehead with attribute
+# renderas="part|chapter|sect1|sect2|sect3|sect4|sect5"
\ No newline at end of file
--- /dev/null
+# Textclass definition file for docbook.
+# Author : José Abílio Oliveira Matos <jamatos@lyx.org>
+
+# This file is the counterpart of stdstruct.inc
+# It is desireable, as far as possible, to have the same look and feeling for
+# related layouts in latex and docbook.
+
+Input stdstruct.inc
+
+# Abstract style definition
+Style Abstract
+ LatexType Environment
+ LatexName abstract
+ LatexParam para
+End
+
+NoStyle Bibliography
\ No newline at end of file
--- /dev/null
+# Textclass definition file for docbook.
+# Author : José Abílio Oliveira Matos <jamatos@lyx.org>
+
+# This file is the counterpart of stdstile.inc
+# It is desireable, as far as possible, to have the same look and feeling for
+# related layouts in latex and docbook.
+
+Input stdtitle.inc
+
+# Title style definition
+Style Title
+ LatexType Command
+ LatexName artheader
+ LatexParam "2|"
+End
+
+# Author style definition
+Style Author
+ LatexType Environment
+ LatexName author
+ KeepEmpty 1
+End
+
+# first name style definition
+Style FirstName
+ Margin Static
+ LatexType Paragraph
+ LatexName firstname
+ ParIndent MM
+ ParSkip 0.4
+ Align Center
+ AlignPossible Center
+ LabelType No_Label
+End
+
+# surname style definition
+Style Surname
+ Margin Static
+ LatexType Paragraph
+ LatexName surname
+ ParIndent MM
+ ParSkip 0.4
+ Align Center
+ AlignPossible Center
+ LabelType No_Label
+End
+
+# Date style definition
+Style Date
+ LatexType Paragraph
+ LatexName date
+End
#% Do not delete the line below; configure depends on this
-# \DeclareDocBookClass[book]{SGML (DocBook book)}
+# \DeclareDocBookClass[book]{DocBook book (SGML)}
# DocBook textclass definition file.
# Author : Jose' Matos <jamatos@lyx.org>
# hacked for books: Luc Abom <luc@abom.com>
# Input general definitions
-Input stdclass.inc
-
-OutputType docbook
-
-MaxCounter Counter_Section
-SecNumDepth 3
-TocDepth 3
-
-#docbook specific definitions
-Style Standard
- LatexType Paragraph
- LatexName para
-End
-
-# Quote style definition
-Style Quotation
- LatexType Environment
- LatexName blockquote
- LatexParam para
-End
-
+Input db_stdclass.inc
+MaxCounter Counter_Chapter
# Title style definition
Style Title
LatexName bookinfo
LatexParam "1|"
End
-
-
-
-# Title style definition
-Style Chapter
- LatexType Command
- LatexName chapter
- LatexParam "1|"
-End
-
-# Section style definition
-Style Section
- LatexType Command
- LatexName sect1
- LatexParam "2|"
-End
-
-# Subsection style definition
-Style Subsection
- LatexType Command
- LatexName sect2
- LatexParam "3|"
-End
-
-# Subsubsection style definition
-Style Subsubsection
- LatexType Command
- LatexName sect3
- LatexParam "4|"
-End
-
-# Paragraph style definition
-Style Paragraph
- LatexType Command
- LatexName sect4
- LatexParam "5|"
-End
-
-# Subparagraph style definition
-Style Subparagraph
- LatexType Command
- LatexName sect5
- LatexParam "6|"
-End
-
-# Enumerate style definition
-Style Enumerate
- LatexType Item_Environment
- LatexName orderedlist
-End
-
-# Itemize style definition
-Style Itemize
- LatexType Item_Environment
- LatexName itemizedlist
-End
-
-# Description style definition
-Style Description
- LatexType Item_environment
- LatexName variablelist
-End
-
-# Verbatim style definition
-Style Literal
- LatexType Environment
- LatexName literallayout
- Font
- Latex Latex
- EndFont
-End
-
-# Code style definition
-Style Code
- CopyStyle LyX-Code
- LatexType Environment
- LatexName programlisting
- Font
- Latex Latex
- EndFont
-End
-
-# Author style definition
-Style Author
- LatexType Environment
- LatexName author
- KeepEmpty 1
-End
-
-# first name style definition
-Style FirstName
- Margin Static
- LatexType Paragraph
- LatexName firstname
- ParIndent MM
- ParSkip 0.4
- Align Center
- AlignPossible Center
- LabelType No_Label
-End
-
-# surname style definition
-Style Surname
- Margin Static
- LatexType Paragraph
- LatexName surname
- ParIndent MM
- ParSkip 0.4
- Align Center
- AlignPossible Center
- LabelType No_Label
-End
-
-# Date style definition
-Style Date
- LatexType Paragraph
- LatexName date
-End
-
-# Abstract style definition
-Style Abstract
- LatexType Environment
- LatexName abstract
- LatexParam para
-End
-
-# SGML style definition
-Style SGML
- CopyStyle LaTeX
- LatexName "!-- --"
-End
-
-# There are no chapters or parts in an docbook article.
-#NoStyle Chapter
-NoStyle Chapter*
-NoStyle Part
-NoStyle Part*
-NoStyle LaTeX
-NoStyle LyX-Code
-NoStyle Address
-NoStyle Right_Address
-NoStyle LaTeX_Title
-NoStyle Verse
-NoStyle Section*
-NoStyle Subsection*
-NoStyle Subsubsection*
-NoStyle Paragraph*
-NoStyle Subparagraph*
-
-Style LyX-Code
- ObsoletedBy Code
-End
--- /dev/null
+#% Do not delete the line below; configure depends on this
+# \DeclareDocBookClass[chapter]{DocBook chapter (SGML)}
+# DocBook textclass definition file.
+# Author : Jose' Matos <jamatos@lyx.org>
+
+# Input general definitions
+Input db_stdclass.inc
+
+MaxCounter Counter_Section
+
+# Title style definition
+Style Title
+ LatexType Command
+ LatexName "!-- --"
+ LatexParam "2|"
+End
+
+# Exclude higher, or equal, sections:
+NoStyle Part
+NoStyle Chapter
--- /dev/null
+#% Do not delete the line below; configure depends on this
+# \DeclareDocBookClass[section]{DocBook section (SGML)}
+# DocBook textclass definition file.
+# Author : Jose' Matos <jamatos@lyx.org>
+
+# Input general definitions
+Input db_stdclass.inc
+
+MaxCounter Counter_Subsection
+
+# Title style definition
+Style Title
+ LatexType Command
+ LatexName "!-- --"
+ LatexParam "3|"
+End
+
+# Exclude higher, or equal, sections:
+NoStyle Part
+NoStyle Chapter
+NoStyle Section
#% Do not delete the line below; configure depends on this
-# \DeclareDocBookClass[article]{SGML (DocBook article)}
+# \DeclareDocBookClass[article]{DocBook article (SGML)}
# DocBook textclass definition file.
# Author : Jose' Matos <jamatos@lyx.org>
# Input general definitions
-Input stdclass.inc
-
-OutputType docbook
+Input db_stdclass.inc
MaxCounter Counter_Section
-SecNumDepth 3
-TocDepth 3
-
-#docbook specific definitions
-Style Standard
- LatexType Paragraph
- LatexName para
-End
-
-# Quote style definition
-Style Quotation
- LatexType Environment
- LatexName blockquote
- LatexParam para
-End
-
-# Title style definition
-Style Title
- LatexType Command
- LatexName artheader
- LatexParam "1|"
-End
-
-# Section style definition
-Style Section
- LatexType Command
- LatexName sect1
- LatexParam "1|"
-End
-
-# Subsection style definition
-Style Subsection
- LatexType Command
- LatexName sect2
- LatexParam "2|"
-End
-
-# Subsubsection style definition
-Style Subsubsection
- LatexType Command
- LatexName sect3
- LatexParam "3|"
-End
-
-# Paragraph style definition
-Style Paragraph
- LatexType Command
- LatexName sect4
- LatexParam "4|"
-End
-
-# Subparagraph style definition
-Style Subparagraph
- LatexType Command
- LatexName sect5
- LatexParam "5|"
-End
-
-# Enumerate style definition
-Style Enumerate
- LatexType Item_Environment
- LatexName orderedlist
-End
-
-# Itemize style definition
-Style Itemize
- LatexType Item_Environment
- LatexName itemizedlist
-End
-
-# Description style definition
-Style Description
- LatexType Item_environment
- LatexName variablelist
-End
-
-# Verbatim style definition
-Style Literal
- LatexType Environment
- LatexName literallayout
- Font
- Latex Latex
- EndFont
-End
-
-# Code style definition
-Style Code
- CopyStyle LyX-Code
- LatexType Environment
- LatexName programlisting
- Preamble
- EndPreamble
- Font
- Latex Latex
- EndFont
-End
-
-# Author style definition
-Style Author
- LatexType Environment
- LatexName author
- KeepEmpty 1
-End
-
-# first name style definition
-Style FirstName
- Margin Static
- LatexType Paragraph
- LatexName firstname
- ParIndent MM
- ParSkip 0.4
- Align Center
- AlignPossible Center
- LabelType No_Label
-End
-
-# surname style definition
-Style Surname
- Margin Static
- LatexType Paragraph
- LatexName surname
- ParIndent MM
- ParSkip 0.4
- Align Center
- AlignPossible Center
- LabelType No_Label
-End
-
-# Date style definition
-Style Date
- LatexType Paragraph
- LatexName date
-End
-
-# Abstract style definition
-Style Abstract
- LatexType Environment
- LatexName abstract
- LatexParam para
-End
-
-# SGML style definition
-Style SGML
- CopyStyle LaTeX
- LatexName "!-- --"
-End
-
-# There are no chapters or parts in an docbook article.
-NoStyle Chapter
-NoStyle Chapter*
-NoStyle Part
-NoStyle Part*
-NoStyle LaTeX
-NoStyle LyX-Code
-NoStyle Address
-NoStyle Right_Address
-NoStyle LaTeX_Title
-NoStyle Verse
-NoStyle Section*
-NoStyle Subsection*
-NoStyle Subsubsection*
-NoStyle Paragraph*
-NoStyle Subparagraph*
-
-Style LyX-Code
- ObsoletedBy Code
-End
+2001-01-28 José Matos <jamatos@fep.up.pt>
+
+ * buffer.C (makeDocBookFile): adds support for document language.
+ A silly restriction on the name of LatexCommand types where removed.
+ Added support for CDATA sections, allows to chars unsecaped, used
+ among others in code, to avoid escape < and >.
+
2001-01-27 Dekel Tsur <dekelts@tau.ac.il>
* BufferView_pimpl.C (savePosition, restorePosition): Use a vector of
<< sgml_includedfiles << " \n]>\n\n";
}
- if (params.options.empty())
- sgmlOpenTag(ofs, 0, top_element);
- else {
- string top = top_element;
+ string top = top_element;
+ top += " lang=\"";
+ top += params.language->code();
+ top += "\"";
+
+ if (!params.options.empty()) {
top += " ";
top += params.options;
- sgmlOpenTag(ofs, 0, top);
}
+ sgmlOpenTag(ofs, 0, top);
ofs << "<!-- DocBook file was created by " << LYX_DOCVERSION
<< "\n See http://www.lyx.org/ for more information -->\n";
sgmlOpenTag(ofs, depth + command_depth, command_name);
item_name = "title";
- if (command_name != "!-- --")
- sgmlOpenTag(ofs, depth + 1 + command_depth, item_name);
+ sgmlOpenTag(ofs, depth + 1 + command_depth, item_name);
break;
case LATEX_ENVIRONMENT:
}
if (style.latextype == LATEX_ENVIRONMENT) {
- if (!style.latexparam().empty())
- sgmlOpenTag(ofs, depth + command_depth,
- style.latexparam());
+ if (!style.latexparam().empty()) {
+ if(style.latexparam() == "CDATA")
+ ofs << "<![ CDATA [";
+ else
+ sgmlOpenTag(ofs, depth + command_depth,
+ style.latexparam());
+ }
break;
}
switch (style.latextype) {
case LATEX_COMMAND:
end_tag = "title";
- if (command_name != "!-- --")
- sgmlCloseTag(ofs, depth + command_depth, end_tag);
+ sgmlCloseTag(ofs, depth + command_depth, end_tag);
break;
case LATEX_ENVIRONMENT:
- if (!style.latexparam().empty())
- sgmlCloseTag(ofs, depth + command_depth,
- style.latexparam());
+ if (!style.latexparam().empty()) {
+ if(style.latexparam() == "CDATA")
+ ofs << "]]>";
+ else
+ sgmlCloseTag(ofs, depth + command_depth,
+ style.latexparam());
+ }
break;
case LATEX_ITEM_ENVIRONMENT:
if (desc_on == 1) break;
projects / lyx.git / commitdiff