From: engelbert g. <gr...@us...> - 2002-12-12 14:34:33
|
Update of /cvsroot/docutils/sandbox/grubert/latex In directory sc8-pr-cvs1:/tmp/cvs-serv3180/latex Modified Files: latex2e.py Log Message: + use a newenvironment instead of a table for optoinlists. Index: latex2e.py =================================================================== RCS file: /cvsroot/docutils/sandbox/grubert/latex/latex2e.py,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- latex2e.py 12 Dec 2002 08:40:45 -0000 1.50 +++ latex2e.py 12 Dec 2002 14:34:28 -0000 1.51 @@ -196,7 +196,7 @@ # maybe should be decided on row count. use_longtable = 1 # description environment for option-list. else tabularx - use_description_for_option_list = 0 + use_optionlist_for_option_list = 1 def __init__(self, document): nodes.NodeVisitor.__init__(self, document) @@ -232,6 +232,17 @@ self.generator, # admonition width and docinfo tablewidth '\\newlength{\\admwidth}\n\\addtolength{\\admwidth}{0.9\\textwidth}\n', + # optionlist environment + '''\\newcommand{\\optionlistlabel}[1]{\\bf #1 \\hfill} + \\newenvironment{optionlist}[1] + {\\begin{list}{} + {\\setlength{\\labelwidth}{#1} + \\setlength{\\rightmargin}{1cm} + \\setlength{\\leftmargin}{\\rightmargin} + \\addtolength{\\leftmargin}{\\labelwidth} + \\addtolength{\\leftmargin}{\\labelsep} + \\renewcommand{\\makelabel}{\\optionlistlabel}} + }{\\end{list}}''', ## stylesheet is last: so it might be possible to overwrite defaults. self.stylesheet % (self.d_stylesheet_path), ] @@ -485,7 +496,7 @@ self.body.append('%[depart_definition_list_item]\n') def visit_description(self, node): - if self.use_description_for_option_list: + if self.use_optionlist_for_option_list: self.body.append( ' ' ) else: self.body.append( ' & ' ) @@ -876,8 +887,8 @@ pass def visit_option_group(self, node): - if self.use_description_for_option_list: - self.body.append('\\item[') + if self.use_optionlist_for_option_list: + self.body.append('\\item [') else: atts = {} if len(node.astext()) > 14: @@ -891,23 +902,23 @@ def depart_option_group(self, node): self.context.pop() # the flag - if self.use_description_for_option_list: - self.body.append(']') + if self.use_optionlist_for_option_list: + self.body.append('] ') else: self.body.append('}') self.body.append(self.context.pop()) def visit_option_list(self, node): - if self.use_description_for_option_list: - self.body.append('\\begin{description}\n') + self.body.append('% [option list]\n') + if self.use_optionlist_for_option_list: + self.body.append('\\begin{optionlist}{3cm}\n') else: - self.body.append('% option list\n') self.body.append('\\begin{center}\n') self.body.append('\\begin{tabularx}{.9\\linewidth}{lX}\n') def depart_option_list(self, node): - if self.use_description_for_option_list: - self.body.append('\\end{description}\n') + if self.use_optionlist_for_option_list: + self.body.append('\\end{optionlist}\n') else: self.body.append('\\end{tabularx}\n') self.body.append('\\end{center}\n') @@ -916,7 +927,7 @@ pass def depart_option_list_item(self, node): - if not self.use_description_for_option_list: + if not self.use_optionlist_for_option_list: self.body.append('\\\\\n') def visit_option_string(self, node): |