Some cosmetic changes for docbook article, cleaner style with Char Styles

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index ff28bd90e7a86a70ce6bfef8110f50e3649f7172..66054605c640eae9e3fe965d656209c5a3c0bbf1 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-12  José Matos  <jamatos@lyx.org>
+
+       * layouts/db_stdclass.inc: do not use small caps for name.
+       * layouts/db_stdtitle.inc: align Date at center.
+       * templates/docbook_article.lyx: Use Character Styles for name.
+       * examples/docbook_article.lyx: remove unnecessary vertical spaces.
+
 2004-05-11  José Matos  <jamatos@lyx.org>
 
        * layouts/db_stdtitle.inc: obsolete FirstName and Surname.

diff --git a/lib/examples/docbook_article.lyx b/lib/examples/docbook_article.lyx
index 2408d56046ffc66e37ec32e1ac82bc8ceeded6de..16cf81d3d9bd7df663e5c43a3e5fd183272bda73 100644 (file)
--- a/lib/examples/docbook_article.lyx
+++ b/lib/examples/docbook_article.lyx
@@ -1,5 +1,5 @@
 #LyX 1.4.0cvs created this file. For more info see http://www.lyx.org/
-\lyxformat 225
+\lyxformat 233
 \textclass docbook
 \language english
 \inputencoding default
@@ -13,6 +13,8 @@
 \use_amsmath 0
 \use_natbib 0
 \use_numerical_citations 0
+\use_jurabib 0
+\use_bibtopic 0
 \paperorientation portrait
 \secnumdepth 3
 \tocdepth 3
@@ -29,8 +31,8 @@
 \begin_layout SGML
 
  
-\begin_inset Note
-collapsed true
+\begin_inset Note Note
+status collapsed
 
 \begin_layout Standard
 
@@ -84,57 +86,20 @@ Docbook with LyX
 
 \begin_layout Author
 
-\end_layout
-
-\begin_deeper 
-\begin_layout SGML
-\align center 
-
-\begin_inset Note
-collapsed true
-
-\begin_layout Standard
-
-The author name is always composed of:
-\end_layout
-
-\begin_layout Standard
-
-* first name
-\end_layout
-
-\begin_layout Standard
-
-* surname
-\end_layout
-
-\begin_layout Standard
-
-It is always possible to have more than one author.
-\end_layout
-
-\end_inset 
-
-
-\end_layout
-
-\end_deeper 
-\begin_layout Author
-
 
 \begin_inset CharStyle Firstname
-collapsed true
+status inlined
 
 \begin_layout Standard
 
-Jose'
+José
 \end_layout
 
 \end_inset 
 
 
 \begin_inset CharStyle Surname
-collapsed true
+status inlined
 
 \begin_layout Standard
 
@@ -320,7 +285,7 @@ Emphasis
 \emph default 
  and 
 \begin_inset CharStyle Literal
-collapsed true
+status inlined
 
 \begin_layout Standard
 
@@ -360,7 +325,8 @@ Notice that when the docbook code is exported the filename extension is
 \begin_inset Float figure
 placement htbp
 wide false
-collapsed false
+sideways false
+status open
 
 \begin_layout Standard
 
@@ -399,7 +365,8 @@ Wide figures are treated as normal figures.
 \begin_inset Float figure
 placement htbp
 wide true
-collapsed false
+sideways false
+status open
 
 \begin_layout Standard
 
@@ -439,7 +406,8 @@ There is also basic support for tables.
 \begin_inset Float table
 placement htbp
 wide false
-collapsed false
+sideways false
+status open
 
 \begin_layout Standard
 \align center 
@@ -653,7 +621,7 @@ It is also possible to insert margin notes inside some environments.
 
 
 \begin_inset Marginal
-collapsed true
+status collapsed
 
 \begin_layout Standard
 
@@ -680,7 +648,7 @@ third par -> margin note
 
 Notice that the previous layout is at level 1 
 \begin_inset Foot
-collapsed true
+status collapsed
 
 \begin_layout Standard
 
@@ -704,7 +672,7 @@ These environments are easily added to the docbook layout.
 
 
 \begin_inset Marginal
-collapsed true
+status collapsed
 
 \begin_layout Standard
 
@@ -779,7 +747,7 @@ book
 
 set (very unlikely)
 \begin_inset Foot
-collapsed true
+status collapsed
 
 \begin_layout Standard
 

diff --git a/lib/layouts/db_stdclass.inc b/lib/layouts/db_stdclass.inc
index 5a48b5984c57da5c3fcd568446023eba0e1031e8..bbe67660a58d22f818cfb84e24e35d04b76be936 100644 (file)
--- a/lib/layouts/db_stdclass.inc
+++ b/lib/layouts/db_stdclass.inc
@@ -44,9 +44,6 @@ End
 CharStyle Firstname
        LatexType             Command
        LatexName             firstname
-       Font
-         Shape               SmallCaps 
-       EndFont
        LabelFont
          Shape               Up
          Color               blue
@@ -56,9 +53,6 @@ End
 CharStyle Surname
        LatexType             Command
        LatexName             surname
-       Font
-         Shape               SmallCaps 
-       EndFont
        LabelFont
          Shape               Up
          Color               blue

diff --git a/lib/layouts/db_stdtitle.inc b/lib/layouts/db_stdtitle.inc
index d95264364768fcd9e63c92a26b67b7edb003191b..0962b1fc4d85fa2276ab9065eb45010a6c328d5a 100644 (file)
--- a/lib/layouts/db_stdtitle.inc
+++ b/lib/layouts/db_stdtitle.inc
@@ -34,7 +34,7 @@ End
 Style Date
        LatexType             Paragraph
        LatexName             date
-       Align                 Left
+       Align                 Center
        AlignPossible         Left,Center
 End
 
@@ -99,4 +99,4 @@ End
 
 Style Surname
        ObsoletedBy   Standard
-End
\ No newline at end of file
+End

diff --git a/lib/templates/docbook_article.lyx b/lib/templates/docbook_article.lyx
index b80419c1c260701ca582f05d52c7634445106dca..318969e2f39d9f9ce4592da5c94596a4307b3975 100644 (file)
--- a/lib/templates/docbook_article.lyx
+++ b/lib/templates/docbook_article.lyx
@@ -1,5 +1,5 @@
-#LyX 1.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 221
+#LyX 1.4.0cvs created this file. For more info see http://www.lyx.org/
+\lyxformat 233
 \textclass docbook
 \language english
 \inputencoding auto
@@ -12,6 +12,8 @@
 \use_amsmath 0
 \use_natbib 0
 \use_numerical_citations 0
+\use_jurabib 0
+\use_bibtopic 0
 \paperorientation portrait
 \secnumdepth 3
 \tocdepth 3
@@ -22,44 +24,59 @@
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
+\tracking_changes 0
+\end_header
+
+\begin_layout Title
 
-\layout Title
-\added_space_top vfill \added_space_bottom vfill 
 Title
-\layout Date
+\end_layout
+
+\begin_layout Date
 
 Date 
-\layout Author
+\end_layout
 
+\begin_layout Author
 
-\begin_inset ERT
-status Collapsed
 
-\layout Standard
-<firstname>
-\end_inset 
+\begin_inset CharStyle Firstname
+status inlined
+
+\begin_layout Standard
 
 Joe
-\begin_inset ERT
-status Collapsed
+\end_layout
 
-\layout Standard
-</firstname><surname>
 \end_inset 
 
+
+\begin_inset CharStyle Surname
+status inlined
+
+\begin_layout Standard
+
 Doe
-\begin_inset ERT
-status Collapsed
+\end_layout
 
-\layout Standard
-</surname>
 \end_inset 
 
 
-\layout Abstract
+\end_layout
+
+\begin_layout Abstract
 
 Abstract
-\layout Section
+\end_layout
+
+\begin_layout Section
 
 First Section
-\the_end
+\end_layout
+
+\begin_layout Standard
+
+First paragraph.
+\end_layout
+
+\end_document