Several overdue fixes to docbook.

New layout for docbook book.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1056 a592a061-630c-0410-9148-cb99ea01b6c8

ChangeLog

@@ -1,3 +1,21 @@
+2000-09-29  José Abílio Matos <jamatos@fep.up.pt>
+
+	* lib/examples/docbook_example.lyx
+	* lib/examples/docbook_article.lyx: file renamed to avoid confusion.
+
+	* lib/layouts/docbook-book.layout: new docbook book layout.
+
+	* lib/layouts/linuxdoc.layout: LatexName of Style SGML is now dummy.
+	
+	* lib/layouts/manpage.layout: Same as above. Style SubSection removed.
+
+	* src/insets/figinset.C (DocBook):fixed small typo.
+
+	* src/insets/insetinclude.C (DocBook): new export for verbatim type.
+
+	* src/insets/insetinclude.h: string include_label doesn't need to be
+	mutable.
+	
 2000-09-29  Allan Rae  <rae@lyx.org>
 
 	* src/frontends/xforms/FormBase.[Ch] (connect, disconnect): new.

lib/layouts/docbook-book.layout

@@ -0,0 +1,187 @@
+#% Do not delete the line below; configure depends on this
+#  \DeclareDocBookClass[book]{SGML (DocBook book)}
+# 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
+
+
+
+# Title style definition
+Style Title
+  LatexType		Command
+  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
+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

lib/layouts/linuxdoc.layout

@@ -368,12 +368,12 @@ End
 Style SGML
   Margin                Static
   LatexType             Paragraph
-  LatexName             p
+  LatexName             dummy
   NewLine               0
   ParIndent             MM
   ParSkip               0.4
   ParSep                0.5
-  Align                 Center
+  Align                 Left
   AlignPossible         Block, Left, Right, Center
   LabelType             No_Label
   FreeSpacing           1

lib/layouts/manpage.layout

@@ -62,32 +62,6 @@ Style Section
   EndFont
 End
 
-# Subsubsection style definition
-Style SubSection
-  Margin		Dynamic
-  LatexType		Command
-  LatexName		sect2
-  NextNoIndent		1
-  LabelSep		xxx
-  ParSkip		0.4
-  TopSep		0.7
-  BottomSep		0.4
-  ParSep		0.4
-  Align			Block
-  AlignPossible		Block, Left
-  LabelType		Counter_SubSubSection
-
-  # standard font definition
-  Font 
-    Series 		Bold
-  EndFont
-
-  # label font definition
-  LabelFont 
-    Series		Bold
-  EndFont
-End
-
 # Enumerate style definition
 Style Enumerate
   Margin		Static
@@ -196,12 +170,12 @@ End
 Style SGML
   Margin                Static
   LatexType             Paragraph
-  LatexName             p
+  LatexName             dummy
   NewLine               0
   ParIndent             MM
   ParSkip               0.4
   ParSep                0.5
-  Align                 Center
+  Align                 Left
   AlignPossible         Block, Left, Right, Center
   LabelType             No_Label
   FreeSpacing           1

src/insets/figinset.C

@@ -1163,7 +1163,7 @@ int InsetFig::DocBook(Buffer const *, ostream & os) const
 	string figurename = MakeRelPath(fname, buf1);
 
 	if(suffixIs(figurename, ".eps"))
-		figurename.erase(fname.length() - 4);
+		figurename.erase(figurename.length() - 4);
 
 	os << "@<graphic fileref=\"" << figurename << "\"></graphic>";
 	return 0;

src/insets/insetinclude.C

@@ -486,7 +486,7 @@ int InsetInclude::DocBook(Buffer const *, ostream & os) const
 	} 
 
 	if (isVerb()) {
-		os << "<!-- includefile verbatim=\"" << incfile << "\" -->";
+		os << "<inlinegraphic fileref=\"" << incfile << "\" format=\"linespecific\">";
 	} else 
 		os << '&' << include_label << ';';
 	

src/insets/insetinclude.h

@@ -116,7 +116,7 @@ private:
         ///
 	Buffer * master;
 	///
-	mutable string include_label;
+	string include_label;
 };