anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert recent change to development/FORMAT (don't change history)

Browse Source 
drop LinuxDoc support (final part)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14823 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2006-08-23 12:55:23 +00:00
parent 5a0176a6eb
commit d056d51087
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/FORMAT
View File

@ -315,7 +315,7 @@ Paragraph text.
extra LaTeX "draft" 'extra' data passed to the primary extra LaTeX "draft" 'extra' data passed to the primary
command for this output format. command for this output format.
(Possible formats LaTeX, PDFLaTeX, (Possible formats LaTeX, PDFLaTeX,
DocBook, Ascii.) LinuxDoc, DocBook, Ascii.)
The string can contain spaces and so The string can contain spaces and so
is wrapped in "...". is wrapped in "...".
rotateAngle 30 Rotation of the data. rotateAngle 30 Rotation of the data.

3
lib/bind/xemacs.bind
View File

@ -245,8 +245,7 @@
## Trying to incorporate the best of AucTeX and HM--HTML modes ## 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 # "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 # similar here.
# making HTML).
## ##
\bind "C-c C-l" "dialog-show latexlog" # show warning log \bind "C-c C-l" "dialog-show latexlog" # show warning log
\bind "C-c C-o" "error-next" \bind "C-c C-o" "error-next"

4
lib/configure.py
View File

@ -496,7 +496,7 @@ def processLayoutFile(file, bool_docbook, bool_linuxdoc):
''' '''
classname = file.split(os.sep)[-1].split('.')[0] classname = file.split(os.sep)[-1].split('.')[0]
# return ('LaTeX', '[a,b]', 'a', ',b,c', 'article') for \DeclearLaTeXClass[a,b,c]{article} # 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(): for line in open(file).readlines():
res = p.search(line) res = p.search(line)
if res != None: if res != None:
@ -558,7 +558,7 @@ def checkLatexConfig(check_config, bool_docbook, bool_linuxdoc):
# Construct the list of classes to test for. # Construct the list of classes to test for.
# build the list of available layout files and convert it to commands # build the list of available layout files and convert it to commands
# for chkconfig.ltx # for chkconfig.ltx
p1 = re.compile(r'\Declare(LaTeX|DocBook|LinuxDoc)Class') p1 = re.compile(r'\Declare(LaTeX|DocBook)Class')
testclasses = list() testclasses = list()
for file in glob.glob( os.path.join('layouts', '*.layout') ) + \ for file in glob.glob( os.path.join('layouts', '*.layout') ) + \
glob.glob( os.path.join(srcdir, 'layouts', '*.layout' ) ) : glob.glob( os.path.join(srcdir, 'layouts', '*.layout' ) ) :

4
src/lyxtextclasslist.C
View File

@ -186,9 +186,9 @@ LyXTextClassList::addTextClass(std::string const & textclass, std::string const
// //
// This is a C++ version of function processLayoutFile in configure.py, // This is a C++ version of function processLayoutFile in configure.py,
// which uses the following regex // which uses the following regex
// \Declare(LaTeX|DocBook|LinuxDoc)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)} // \Declare(LaTeX|DocBook)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)}
ifstream ifs(layout_file.c_str()); 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*"); "(?:\\[([^,]*)(?:,.*)*\\])*\\s*\\{(.*)\\}\\s*");
string line; string line;
while (getline(ifs, line)) { while (getline(ifs, line)) {