/home/balu/mes.cvs

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

lib/ChangeLog

@@ -1,3 +1,16 @@
+2001-02-26  José Matos  <jamatos@fep.up.pt>
+
+	* templates/docbook_template.lyx: removed.
+	* templates/docbook_article.lyx: updated file, to replace the previous.
+
+	* templates/linuxdoctemplate.lyx: removed.
+	* templates/linuxdoc_article.lyx: updated file, to replace the previous.
+
+2001-02-11  José Matos  <jamatos@fep.up.pt>
+
+	* layouts/docbook.layout: chapter and part insertion are forbiden in
+	article.
+
 2001-02-26  Juergen Vigna  <jug@sad.it>
 
 	* ui/default.ui: added Custom-Export to export menu.
@@ -7,7 +20,6 @@
 	* bind/emacs.bind: 
 	* bind/xemacs.bind: add bookmark commands. 
 	
-
 2001-02-07  Allan Rae  <rae@lyx.org>
 
 	* bind/emacs.bind: 
@@ -46,7 +58,7 @@
 
 	* ui/default.ui: Fix typos.
 
-2001-01-28  José Matos <jamatos@fep.up.pt>
+2001-01-28  José Matos  <jamatos@fep.up.pt>
 
 	* layouts/db_lyxmacros.inc
 	* layouts/db_stdclass.inc

lib/templates/docbook_article.lyx

@@ -1,18 +1,6 @@
-#This file was created by <jamatos> Fri Sep 24 13:10:52 1999
+#LyX 1.2 created this file. For more info see http://www.lyx.org/
-#LyX 1.0 (C) 1995-1999 Matthias Ettrich and the LyX Team
+\lyxformat 218
-\lyxformat 2.15
 \textclass docbook
-\begin_preamble
-<!entity header system "header.sgml">
-\end_preamble
-\language english
-\inputencoding default
-\fontscheme default
-\graphics default
-\paperfontsize default
-\spacing single 
-\papersize Default
-\paperpackage a4
 \use_geometry 0
 \use_amsmath 0
 \paperorientation portrait
@@ -20,11 +8,8 @@
 \tocdepth 3
 \paragraph_separation indent
 \defskip medskip
-\quotes_language english
-\quotes_times 2
 \papercolumns 1
-\papersides 1
+\papersides 1                                                                                                                                                                                                                       
-\paperpagestyle default
 
 \layout Title
 \added_space_top vfill \added_space_bottom vfill 

lib/templates/linuxdoc_article.lyx

@@ -0,0 +1,37 @@
+#LyX 1.2 created this file. For more info see http://www.lyx.org/
+\lyxformat 218
+\textclass linuxdoc
+\use_geometry 0
+\use_amsmath 0
+\paperorientation portrait
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\defskip medskip
+\papercolumns 1
+\papersides 1
+
+\layout Title
+\added_space_top vfill \added_space_bottom vfill 
+TITLE
+\layout Author
+
+AUTHOR 
+\layout Date
+
+DATE
+\layout Abstract
+
+ABSTRACT
+\layout Standard
+
+
+\begin_inset LatexCommand \tableofcontents{}
+
+\end_inset 
+
+
+\layout Section
+
+First Section
+\the_end

lib/templates/linuxdoctemplate.lyx

@@ -1,48 +0,0 @@
-#This file was created by <iselborn> Fri Jun 27 07:10:39 1997
-#LyX 0.11 (C) 1995-1997 Matthias Ettrich and the LyX Team
-\lyxformat 2.15
-\textclass linuxdoc
-\language english
-\inputencoding default
-\fontscheme default
-\graphics default
-\paperfontsize 10
-\spacing single 
-\papersize Default
-\paperpackage a4
-\use_geometry 0
-\paperorientation portrait
-\secnumdepth 3
-\tocdepth 3
-\paragraph_separation indent
-\defskip medskip
-\quotes_language english
-\quotes_times 2
-\papercolumns 1
-\papersides 1
-\paperpagestyle default
-
-\layout Title
-\added_space_top vfill \added_space_bottom vfill 
-TITLE
-\layout Author
-
-AUTHOR 
-\layout Date
-
-DATE
-\layout Abstract
-
-ABSTRACT
-\layout Standard
-
-
-\begin_inset LatexCommand \tableofcontents
-
-\end_inset 
-
-
-\layout Section
-\cursor 0 
-First Section
-\the_end

src/ChangeLog

@@ -1,3 +1,13 @@
+2001-02-27  José Matos  <jamatos@fep.up.pt>
+	
+	* LaTeXFeatures.C (getIncludedFiles): call to BasePath replaced
+	by OnlyPath.
+	
+2001-02-11  José Matos  <jamatos@fep.up.pt>
+
+	* buffer.C (makeDocBookFile): command styles now have a parameter as
+	"title" by default.
+
 2001-02-23  Edwin Leuven <leuven@fee.uva.nl>
 
 	* layout_forms.[Ch]: removed

src/LaTeXFeatures.C

@@ -377,7 +377,7 @@ string const LaTeXFeatures::getTClassPreamble()
 string const LaTeXFeatures::getIncludedFiles(string const fname) const
 {
 	string sgmlpreamble;
-	string basename = BasePath(fname);
+	string basename = OnlyPath(fname);
 
 	FileMap::const_iterator end = IncludedFiles.end();
 	for (FileMap::const_iterator fi = IncludedFiles.begin();

src/support/ChangeLog

@@ -1,3 +1,12 @@
+2001-02-27  José Matos  <jamatos@fep.up.pt>
+
+	* filetools.h (BasePath):
+	* filetools.C (BasePath): removed since it is a duplicate of OnlyPath.
+
+	* filetools.C (IsLyXFilename):
+	* filetools.C (IsSGMLFilename): test if extension is suffix and not
+	only containned.
+
 2001-02-14  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
 	* fmt.C: 

src/support/filetools.C

@@ -68,13 +68,13 @@ extern string system_tempdir;
 
 bool IsLyXFilename(string const & filename)
 {
-	return contains(filename, ".lyx");
+	return suffixIs(filename, ".lyx");
 }
 
 
 bool IsSGMLFilename(string const & filename)
 {
-	return contains(filename, ".sgml");
+	return suffixIs(filename, ".sgml");
 }
 
 
@@ -648,21 +648,6 @@ string const OnlyFilename(string const & fname)
 }
 
 
-// Strips filename from path
-string const BasePath(string const & fname)
-{
-	if (fname.empty())
-		return fname;
-
-	string::size_type j = fname.rfind('/');
-	if (j == string::npos) // no '/' in fname
-		return string();
-
-	// Strip to basename
-	return fname.substr(0,j + 1);
-}
-
-
 // Is a filename/path absolute?
 bool AbsolutePath(string const & path)
 {

src/support/filetools.h

@@ -179,9 +179,6 @@ string const NormalizePath(string const & path);
 /// Strips path from filename
 string const OnlyFilename(string const & fname);
 
-/// Strips filename from path
-string const BasePath(string const & fname);
-
 /// Get the contents of a file as a huge string
 string const GetFileContents(string const & fname);