diff --git a/lib/examples/docbook_article.lyx b/lib/examples/docbook_article.lyx index 890a65d71d..3818f72ac4 100644 --- a/lib/examples/docbook_article.lyx +++ b/lib/examples/docbook_article.lyx @@ -1,4 +1,4 @@ -#LyX 1.4.1 created this file. For more info see http://www.lyx.org/ +#LyX 1.4.4svn created this file. For more info see http://www.lyx.org/ \lyxformat 245 \begin_document \begin_header @@ -29,80 +29,19 @@ \begin_body -\begin_layout Standard -\begin_inset ERT -status inlined - -\begin_layout Standard - - - -\begin_inset Note Note -status collapsed - -\begin_layout Standard - -Here goes the information about the article: -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard - -* title -\end_layout - -\begin_layout Standard - -* date -\end_layout - -\begin_layout Standard - -* author -\end_layout - -\begin_layout Standard - -+ first name -\end_layout - -\begin_layout Standard - -+ last name -\end_layout - -\begin_layout Standard - -* abstract -\end_layout - -\end_inset - - -\end_layout - \begin_layout Title - Docbook with LyX \end_layout \begin_layout Date - 24 September 1999 \end_layout \begin_layout Author - - \begin_inset CharStyle Firstname status inlined \begin_layout Standard - José \end_layout @@ -113,7 +52,6 @@ Jos status inlined \begin_layout Standard - Matos \end_layout @@ -123,18 +61,14 @@ Matos \end_layout \begin_layout Abstract - This is a small illustration of lyx's features using DocBook. \end_layout \begin_layout Abstract - The abstract can span several paragraphs. \end_layout \begin_layout Section - - \begin_inset LatexCommand \label{first-section} \end_inset @@ -143,28 +77,23 @@ Introduction \end_layout \begin_layout Standard - This file ilustrates the generation of docbook documents with LyX. \end_layout \begin_layout Standard - This will improve as soon as new features are available. \end_layout \begin_layout Section - Standard layouts \end_layout \begin_layout Standard - One of the goals is the support, as much as possible, of layouts used in other textclass, for compatibility purposes. \end_layout \begin_layout Standard - Remember that this is work in progress, I would like to hear any comments, good or \begin_inset Quotes eld @@ -178,101 +107,82 @@ bad \end_layout \begin_layout Subsection - Lists \end_layout \begin_layout Standard - This is an example with several nested lists. \end_layout \begin_layout Itemize - item 1 \end_layout \begin_deeper \begin_layout Enumerate - item 2 \end_layout \begin_layout Description - new item \end_layout \begin_deeper \begin_layout Enumerate - collection \end_layout \end_deeper \end_deeper \begin_layout Itemize - new set \end_layout \begin_layout Subsection - Code \end_layout \begin_layout Standard - Required steps to have a running lyx. \end_layout \begin_layout Quotation - Be carefull with your own code. \end_layout \begin_layout Quotation - The debugger. \end_layout \begin_layout Code - cat > env.out \end_layout \begin_layout Code - tar xvzf lyx.tgz \end_layout \begin_layout Code - cd lyx-1_0_x \end_layout \begin_layout Code - ./configure \end_layout \begin_layout Code - make \end_layout \begin_layout Code - make install \end_layout \begin_layout Subsection - Labels \end_layout \begin_layout Standard - If a label is the first element in any layout, that label will be merged with that element. See as an example @@ -284,12 +194,10 @@ If a label is the first element in any layout, that label will be merged \end_layout \begin_layout Subsection - Fonts \end_layout \begin_layout Standard - The only fonts supported are \emph on Emphasis @@ -299,7 +207,6 @@ Emphasis status inlined \begin_layout Standard - SGML \end_layout @@ -309,12 +216,10 @@ SGML \end_layout \begin_layout Subsection - Figures \end_layout \begin_layout Standard - One of the major changes in the docbook when compared with the linuxdoc support are the figures support. LyX only allows to view eps figures. @@ -322,7 +227,6 @@ One of the major changes in the docbook when compared with the linuxdoc \end_layout \begin_layout Standard - Notice that when the docbook code is exported the filename extension is stripped. This enables that when the several backends are processed in sgmltools, @@ -331,8 +235,6 @@ Notice that when the docbook code is exported the filename extension is \end_layout \begin_layout Standard - - \begin_inset Float figure placement htbp wide false @@ -340,8 +242,6 @@ sideways false status open \begin_layout Standard - - \begin_inset Graphics filename ../doc/platypus.eps display grayscale @@ -356,7 +256,6 @@ status open \end_layout \begin_layout Caption - Nice platypus \end_layout @@ -366,13 +265,10 @@ Nice platypus \end_layout \begin_layout Standard - Wide figures are treated as normal figures. \end_layout \begin_layout Standard - - \begin_inset Float figure placement htbp wide true @@ -380,8 +276,6 @@ sideways false status open \begin_layout Standard - - \begin_inset Graphics filename ../doc/platypus.eps display grayscale @@ -396,7 +290,6 @@ status open \end_layout \begin_layout Caption - long, very long... :-) \end_layout @@ -407,12 +300,10 @@ long, very long... \end_layout \begin_layout Subsection - Tables \end_layout \begin_layout Standard - There is also basic support for tables. \begin_inset Float table placement htbp @@ -422,7 +313,6 @@ status open \begin_layout Standard \align center - \begin_inset Tabular @@ -445,7 +335,6 @@ status open \begin_inset Text \begin_layout Standard - Software 1 \end_layout @@ -455,7 +344,6 @@ Software 1 \begin_inset Text \begin_layout Standard - Software 2 \end_layout @@ -465,7 +353,6 @@ Software 2 \begin_inset Text \begin_layout Standard - Software 3 \end_layout @@ -475,7 +362,6 @@ Software 3 \begin_inset Text \begin_layout Standard - Software 4 \end_layout @@ -487,7 +373,6 @@ Software 4 \begin_inset Text \begin_layout Standard - Plataform 1 \end_layout @@ -497,7 +382,6 @@ Plataform 1 \begin_inset Text \begin_layout Standard - 25 MB \end_layout @@ -507,7 +391,6 @@ Plataform 1 \begin_inset Text \begin_layout Standard - 10 MB \end_layout @@ -517,7 +400,6 @@ Plataform 1 \begin_inset Text \begin_layout Standard - 34 MB \end_layout @@ -538,7 +420,6 @@ Plataform 1 \begin_inset Text \begin_layout Standard - Plataform 2 \end_layout @@ -557,7 +438,6 @@ Plataform 2 \begin_inset Text \begin_layout Standard - 12 MB \end_layout @@ -567,7 +447,6 @@ Plataform 2 \begin_inset Text \begin_layout Standard - 30 MB \end_layout @@ -577,7 +456,6 @@ Plataform 2 \begin_inset Text \begin_layout Standard - 35 MB \end_layout @@ -592,7 +470,6 @@ Plataform 2 \end_layout \begin_layout Caption - Nice Formal Table \end_layout @@ -602,17 +479,14 @@ Nice Formal Table \end_layout \begin_layout Standard - As it happens with the figures the wide tables are treated as normal tables. \end_layout \begin_layout Subsection - Margins \end_layout \begin_layout Standard - There are some restrictions when using margins. For further information on docbook allowed syntax consult the \begin_inset LatexCommand \url[docbook reference manual]{http://www.oasis-open.org/docbook/documentation/reference/} @@ -623,7 +497,6 @@ There are some restrictions when using margins. \end_layout \begin_layout Quotation - It is also possible to insert margin notes inside some environments. \end_layout @@ -634,13 +507,10 @@ status inlined \begin_layout Standard - - \begin_inset Marginal status collapsed \begin_layout Standard - margin note \end_layout @@ -666,20 +536,17 @@ third par -> margin note \end_deeper \begin_layout Quotation - Notice that the previous layout is at level 1 \begin_inset Foot status collapsed \begin_layout Standard - This comes from a docbook restriction. Sidebar can only appear inside "MSGTEXT", "CAUTION", "IMPORTANT", "NOTE", "TIP", "WARNING", "BLOCKQUOTE". \end_layout \begin_layout Standard - These environments are easily added to the docbook layout. \end_layout @@ -695,13 +562,10 @@ status inlined \begin_layout Standard - - \begin_inset Marginal status collapsed \begin_layout Standard - too marginal ;-) \end_layout @@ -717,71 +581,58 @@ too marginal ;-) \end_deeper \begin_layout Section - The road map \end_layout \begin_layout Standard - This is a small list of the remaining tasks: \end_layout \begin_layout Itemize - Expand the number of layouts \end_layout \begin_deeper \begin_layout Itemize - example \end_layout \begin_layout Itemize - note \end_layout \begin_layout Itemize - warning \end_layout \begin_layout Itemize - tip \end_layout \begin_layout Itemize - caution \end_layout \begin_layout Itemize - important \end_layout \end_deeper \begin_layout Itemize - Compose other layout files, besides article \end_layout \begin_deeper \begin_layout Enumerate - book \end_layout \begin_layout Enumerate - set (very unlikely) \begin_inset Foot status collapsed \begin_layout Standard - I do not expect lyx to deal with colection of books, for now! \end_layout @@ -791,35 +642,29 @@ I do not expect lyx to deal with colection of books, for now! \end_layout \begin_layout Enumerate - refentry \end_layout \end_deeper \begin_layout Itemize - goodies \end_layout \begin_deeper \begin_layout Enumerate - including other lyx files \end_layout \begin_layout Enumerate - more advanced tables support \end_layout \end_deeper \begin_layout Itemize - better documentation \end_layout \begin_layout Standard - That's all. ;-) \end_layout diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py index edbf21d61f..41c7f52452 100755 --- a/lib/generate_contributions.py +++ b/lib/generate_contributions.py @@ -654,6 +654,14 @@ contributers = [ "22 February 2005", u"Fix to a very hard-to-find egcs bug that crashed LyX on alpha architecture"), + contributer(u"Harshula Jayasuriya", + "harshula () gmail ! com", + "GPL", + "Re: Bug in export to DocBook", + "m=116884249725701", + "15 January 2007", + u"Fix docbook generation of nested lists"), + contributer(u"David L. Johnson", "david.johnson () lehigh ! edu", "GPL", diff --git a/lib/layouts/manpage.layout b/lib/layouts/manpage.layout index 1c601aa0e8..0c1c634b6a 100644 --- a/lib/layouts/manpage.layout +++ b/lib/layouts/manpage.layout @@ -11,6 +11,10 @@ PageStyle Plain OutputType linuxdoc DefaultStyle Standard +ClassOptions + Header "