From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Wed, 23 Aug 2006 12:55:23 +0000 (+0000)
Subject: revert recent change to development/FORMAT (don't change history)
X-Git-Tag: 1.6.10~12704
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d056d510879bbdff0e62a586bd55b466cb8887ad;p=features.git

revert recent change to development/FORMAT (don't change history)
drop LinuxDoc support (final part)

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

diff --git a/development/FORMAT b/development/FORMAT
index aa8f8232c1..314f9b0b20 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -315,7 +315,7 @@ Paragraph text.
 	extra LaTeX "draft"             'extra' data passed to the primary
 	                                command for this output format.
 	                                (Possible formats LaTeX, PDFLaTeX,
-	                                 DocBook, Ascii.)
+	                                 LinuxDoc, DocBook, Ascii.)
 	                                The string can contain spaces and so
 	                                is wrapped in "...".
 	rotateAngle 30                  Rotation of the data.
diff --git a/lib/bind/xemacs.bind b/lib/bind/xemacs.bind
index fbd841fee2..03c54cfe48 100644
--- a/lib/bind/xemacs.bind
+++ b/lib/bind/xemacs.bind
@@ -245,8 +245,7 @@
 ## Trying to incorporate the best of AucTeX and HM--HTML modes
 ##
 # "C-z" is used in HM--HTML-mode for paragraph styles so try to support
-#  similar here especially for LinuxDoc (although LinuxDoc isn't only for
-#  making HTML).
+#  similar here.
 ##
 \bind "C-c C-l"                 "dialog-show latexlog"        # show warning log
 \bind "C-c C-o"                 "error-next"
diff --git a/lib/configure.py b/lib/configure.py
index 641e0fbe0f..11a06f85dc 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -496,7 +496,7 @@ def processLayoutFile(file, bool_docbook, bool_linuxdoc):
     '''
     classname = file.split(os.sep)[-1].split('.')[0]
     # return ('LaTeX', '[a,b]', 'a', ',b,c', 'article') for \DeclearLaTeXClass[a,b,c]{article}
-    p = re.compile(r'\Declare(LaTeX|DocBook|LinuxDoc)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)}')
+    p = re.compile(r'\Declare(LaTeX|DocBook)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)}')
     for line in open(file).readlines():
         res = p.search(line)
         if res != None:
@@ -558,7 +558,7 @@ def checkLatexConfig(check_config, bool_docbook, bool_linuxdoc):
         # Construct the list of classes to test for.
         # build the list of available layout files and convert it to commands
         # for chkconfig.ltx
-        p1 = re.compile(r'\Declare(LaTeX|DocBook|LinuxDoc)Class')
+        p1 = re.compile(r'\Declare(LaTeX|DocBook)Class')
         testclasses = list()
         for file in glob.glob( os.path.join('layouts', '*.layout') ) + \
             glob.glob( os.path.join(srcdir, 'layouts', '*.layout' ) ) :
diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index 0b845e4c9b..11e08c0883 100644
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -186,9 +186,9 @@ LyXTextClassList::addTextClass(std::string const & textclass, std::string const
 		//
 		// This is a C++ version of function processLayoutFile in configure.py,
 		// which uses the following regex
-		//     \Declare(LaTeX|DocBook|LinuxDoc)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)}
+		//     \Declare(LaTeX|DocBook)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)}
 		ifstream ifs(layout_file.c_str());
-		static regex const reg("^#\\s*\\\\Declare(LaTeX|DocBook|LinuxDoc)Class\\s*"
+		static regex const reg("^#\\s*\\\\Declare(LaTeX|DocBook)Class\\s*"
 			"(?:\\[([^,]*)(?:,.*)*\\])*\\s*\\{(.*)\\}\\s*");
 		string line;
 		while (getline(ifs, line)) {