Docbook supported version is now 4.1 (only 3 lines changed for that).

Removed unused function.

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 0f903b23d606ff42b4cc7e9aa60eb006f9829036..8930dc83bd9d8a3264157a2a0fd9832fed7da9d1 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-24  José Matos  <jamatos@fep.up.pt>
+
+       * layouts/db_lyxmacros.inc:
+       * layouts/db_stdtitle.inc: moved docbook supported version to v4.1.
+       
 2001-10-24  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * examples/it_splash.lyx: update from Claudio Coco

diff --git a/lib/layouts/db_lyxmacros.inc b/lib/layouts/db_lyxmacros.inc
index a4d19f50d4ac193912b53f6b75feb90863fec39c..ef3cc0811d4ba4ecbf6d6d16e5be9ce79d27cfad 100644 (file)
--- a/lib/layouts/db_lyxmacros.inc
+++ b/lib/layouts/db_lyxmacros.inc
@@ -19,7 +19,7 @@ End
 # Comment style definition
 Style Comment
   LatexType            Paragraph
-  LatexName            comment
+  LatexName            remark
 End
 
 Style LyX-Code

diff --git a/lib/layouts/db_stdtitle.inc b/lib/layouts/db_stdtitle.inc
index bc2133491d19bcd86eedfd50a9b721dee7c5f32f..4c2d9bdc162fd9e1067b70b2102485ea5caf0035 100644 (file)
--- a/lib/layouts/db_stdtitle.inc
+++ b/lib/layouts/db_stdtitle.inc
@@ -10,7 +10,7 @@ Input stdtitle.inc
 # Title style definition
 Style Title
   LatexType            Command
-  LatexName            artheader
+  LatexName            articleinfo
   LatexParam           "2|"
 End
 

diff --git a/src/ChangeLog b/src/ChangeLog
index e92ab5b0d6bcbb5d518571b1e3a63205d11d3f46..310fad902f3baf890459932f1dc5d0b78ff96261 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-24  José Matos  <jamatos@fep.up.pt>
+
+       * buffer.h (docbookHandleCaption):
+       * buffer.C (docbookHandleCaption): removed unused function.
+       (makeDocBookFile): moved docbook supported version to v4.1.
+
 2001-10-24  José Matos  <jamatos@fep.up.pt>
 
        * tabular.h:

diff --git a/src/buffer.C b/src/buffer.C
index fca885ff86c2c4444049555cde4666718b4147ba..114cb02e3212a7a9efec0fa1e8b8b6a24e191d49 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -2720,30 +2720,6 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
 }
 
 
-void Buffer::docbookHandleCaption(ostream & os, string & inner_tag,
-                                 Paragraph::depth_type depth, int desc_on,
-                                 Paragraph * & par)
-{
-       Paragraph * tpar = par;
-       while (tpar
-              && (tpar->layout != textclasslist.NumberOfLayout(params.textclass,
-                                                               "Caption").second))
-               tpar = tpar->next();
-
-       if (tpar &&
-           tpar->layout == textclasslist.NumberOfLayout(params.textclass,
-                                                        "Caption").second) {
-               sgmlOpenTag(os, depth + 1, inner_tag);
-               string extra_par;
-               simpleDocBookOnePar(os, extra_par, tpar,
-                                   desc_on, depth + 2);
-               sgmlCloseTag(os, depth+1, inner_tag);
-               if (!extra_par.empty())
-                       os << extra_par;
-       }
-}
-
-
 // checks, if newcol chars should be put into this line
 // writes newline, if necessary.
 namespace {
@@ -2799,8 +2775,6 @@ void reset(PAR_TAG & p1, PAR_TAG const & p2)
 } // namespace anon
 
 
-
-
 // Handle internal paragraph parsing -- layout already processed.
 void Buffer::simpleLinuxDocOnePar(ostream & os,
                                  Paragraph * par, 
@@ -3028,7 +3002,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 
        if (!only_body) {
                ofs << "<!DOCTYPE " << top_element
-                   << "  PUBLIC \"-//OASIS//DTD DocBook V3.1//EN\"";
+                   << "  PUBLIC \"-//OASIS//DTD DocBook V4.1//EN\"";
 
                string preamble = params.preamble;
                preamble += features.getIncludedFiles(fname);

diff --git a/src/buffer.h b/src/buffer.h
index 5460dec970680bd5f2af54cb2ae24d1f36a0bacd..a5acfada54c0306518aed693dfd3d2aea39a0ea7 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -327,10 +327,6 @@ public:
        /// Used when typesetting to place errorboxes.
        TexRow texrow;
 private:
-        ///
-       void docbookHandleCaption(std::ostream & os, string & inner_tag,
-                                 Paragraph::depth_type depth, int desc_on,
-                                 Paragraph * & par);
        /// Open SGML/XML tag.
         void sgmlOpenTag(std::ostream & os, Paragraph::depth_type depth,
                         string const & latexname) const;