# the author information area. There is a LaTeX 2.09 IEEEtran.sty available
# also but LyX doesn't support 2.09 stuff so don't get that one.
-Format 3
+Format 4
Style Standard
Margin Static
LatexType Paragraph
# abstract is command
-Format 3
+Format 4
Columns 2
Sides 2
SecNumDepth 3
# Author: Peter Sütterlin <pit@uni-sw.gwdg.de>
-Format 3
+Format 4
Style Subtitle
Margin Static
LatexType Command
# and reconfigure LyX (after running texhash, of course).
-Format 3
+Format 4
Columns 2
Sides 2
SecNumDepth 3
# Version 1.3 5/7/04 - Updated for AASTeX 5.2
-Format 3
+Format 4
Columns 1
Sides 1
#SecNumDepth 3
TocDepth 0
PageStyle Plain
-ProvidesAmsmath 1
-ProvidesNatbib 1
-ProvidesUrl 1
+Provides amsmath 1
+Provides natbib 1
+Provides url 1
ClassOptions
# Martin Vermeer <martin.vermeer@hut.fi>
-Format 3
+Format 4
Input agu_stdclass.inc
# Exclude higher, or equal, sections:
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
-Format 3
+Format 4
OutputType docbook
Columns 1
# This include file contains all the counters that are defined as standard
# in AGU-Article LyX layouts.
-Format 3
+Format 4
Counter
Name sect1
Within section
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
-Format 3
+Format 4
Input stdlists.inc
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
-Format 3
+Format 4
Input stdsections.inc
Style Part
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
-Format 3
+Format 4
Input stdtitle.inc
# Author: Martin Vermeer <martin.vermeer@hut.fi>
-Format 3
+Format 4
Input aguplus.inc
ClassOptions
# ftp://ftp.agu.org/journals/latex/journals
-Format 3
+Format 4
Input stdclass.inc
SecNumDepth 4
# Probably broken by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
# modified and modularized by Emmanuel GUREGHIAN <gureghia@boston.bertin.fr>
-Format 3
+Format 4
Input amsart.layout
# Change the definitions of the theorem-like environments to get unnumbered
# Probably broken by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
# modified and modularized by Emmanuel GUREGHIAN <gureghia@boston.bertin.fr>
-Format 3
+Format 4
Input amsart.layout
# Change the definitions of the theorem-like environments to get a
# Probably broken by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
# modified and modularized by Emmanuel GUREGHIAN <gureghia@boston.bertin.fr>
-Format 3
+Format 4
Columns 1
Sides 2
PageStyle Headers
# modified and modularized by Emmanuel GUREGHIAN <gureghia@boston.bertin.fr>
-Format 3
+Format 4
Columns 1
Sides 2
PageStyle Headers
# modified and modularized by Emmanuel GUREGHIAN <gureghia@boston.bertin.fr>
# Including the maths stuff
-Format 3
+Format 4
Input amsmaths.inc
# The AMS documentclasses use the package amsmath and provide the
# functionality of makeidx.sty.
-ProvidesAmsmath 1
-ProvidesMakeidx 1
+Provides amsmath 1
+Provides makeidx 1
# the environments copied from the old amsart.layout are:
# - Conclusion
-Format 3
+Format 4
Style Theorem
LatexName thm*
LabelString "Theorem."
# - Conclusion
-Format 3
+Format 4
Style Theorem
Preamble
\theoremstyle{plain}
# - Fact
# - Fact*
-Format 3
+Format 4
Preamble
\theoremstyle{plain}
\newtheorem{thm}{Theorem}[section]
# \DeclareLaTeXClass[apa,apacite.sty]{article (APA)}
# Author: Randy Gobbel <gobbel@andrew.cmu.edu>
-Format 3
+Format 4
Columns 1
Sides 1
PageStyle Headers
# Arabic article textclass definition file.
# Author: Dekel Tsur <dekel@math.tau.ac.il>
-Format 3
+Format 4
Input article
# Transposed by Pascal André <andre@via.ecp.fr>
# Heavily modifed and enhanced by serveral developers.
-Format 3
+Format 4
Input stdclass.inc
SecNumDepth 3
# $Header: /cvsroot/latex-beamer/latex-beamer/lyx/layouts/beamer.layout,v 1.16 2004/10/07 20:53:07 tantau Exp $
# Includes
-Format 3
+Format 4
Input stdcounters.inc
# General textclass parameters
# Heavily modifed and enhanced by serveral developers.
-Format 3
+Format 4
Input stdclass.inc
Input numreport.inc
# For theater plays
-Format 3
+Format 4
Columns 1
Sides 1
SecNumDepth 2
# \vspace*{-0.5in})
#
-Format 3
+Format 4
Preamble
\usepackage[ps,mover]{lyxskak}
%%% initialize board
# Springer's cl2emult textclass definition file.
# Author : André Poenitz
-Format 3
+Format 4
Columns 1
Sides 1
SecNumDepth 2
# Author : Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr)
-Format 3
+Format 4
Columns 1
Sides 1
SecNumDepth -1
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
-Format 3
+Format 4
Input lyxmacros.inc
Style Code
# Author : José Abílio Oliveira Matos <jamatos@lyx.org>
# Character Styles definition
-Format 3
+Format 4
CharStyle Filename
LatexType Command
LatexName filename
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
-Format 3
+Format 4
OutputType docbook
Columns 1
# This include file contains all the counters that are defined as standard
# in Docbook LyX layouts.
-Format 3
+Format 4
Counter
Name sect1
Within chapter
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
-Format 3
+Format 4
Input stdlayouts.inc
Style Literal
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
-Format 3
+Format 4
Input stdlists.inc
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
-Format 3
+Format 4
Input stdsections.inc
Style Part
# modifying the style of the regular sectioning layouts.
-Format 3
+Format 4
Style Part*
CopyStyle Part
Margin Static
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
-Format 3
+Format 4
Input stdstruct.inc
Style Abstract
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
-Format 3
+Format 4
Input stdtitle.inc
# Modifies only some things from letter.layout
-Format 3
+Format 4
Input letter.layout
# Author : Jose' Matos <jamatos@lyx.org>
# hacked for books: Luc Abom <luc@abom.com>
-Format 3
+Format 4
Input report
Input db_stdclass.inc
# DocBook textclass definition file.
# Author : Jose' Matos <jamatos@lyx.org>
-Format 3
+Format 4
Input db_stdclass.inc
Style Title
# DocBook textclass definition file.
# Author : Jose' Matos <jamatos@lyx.org>
-Format 3
+Format 4
Input db_stdclass.inc
Style Title
# DocBook textclass definition file.
# Author : Jose' Matos <jamatos@lyx.org>
-Format 3
+Format 4
Input db_stdclass.inc
# Exclude higher, or equal, sections:
# Author : Herbert Voss <voss@lyx.org> 2001/08/13
-Format 3
+Format 4
Columns 1
Sides 2
SecNumDepth -1 # no counting
# Converted article -> egs Martin Vermeer
-Format 3
+Format 4
Columns 2
Sides 1
PageStyle Plain
-ProvidesNatbib 1
+Provides natbib 1
Style Standard
# numbered sections, as does the class file.
-Format 3
+Format 4
Columns 1
Sides 2
PageStyle headings
# Based on LyX article class; modified to support ENTCS class
# Reuben Thomas (rrt@sc3d.org) 27/5-2/6/01
-Format 3
+Format 4
Input article.layout
# only font size 11pt is really available
# General textclass parameters
- Format 3
+Format 4
Columns 1
Sides 1
SecNumDepth -1
# \DeclareLaTeXClass{extarticle}
# Herbert Voss <voss@lyx.org>
-Format 3
+Format 4
Input article.layout
# change available fontsizes
# Extended book textclass definition file.
# Herbert Voss <voss@lyx.org>
-Format 3
+Format 4
Input book.layout
# change available fontsizes
# Extended article textclass definition file.
# Herbert Voss <voss@lyx.org>
-Format 3
+Format 4
Input letter.layout
# change available fontsizes
# Extented report textclass definition file.
# Herbert Voss <voss@lyx.org>
-Format 3
+Format 4
Input report.layout
# change available fontsizes
# To do: Define class specific options.
-Format 3
+Format 4
Columns 1
Sides 1
# Letter textclass definition file.
# Author : Thomas Hartkens <thomas@hartkens.de>
-Format 3
+Format 4
Input stdfloats.inc
Input stdcounters.inc
# Letter textclass definition file.
# Author : Thomas Hartkens <thomas@hartkens.de>
-Format 3
+Format 4
Input stdfloats.inc
Input stdcounters.inc
# General textclass parameters
-Format 3
+Format 4
Columns 1
Sides 1
PageStyle Empty
# Author: Dekel Tsur <dekel@math.tau.ac.il>
# Few changes by Baruch Even <baruch.even@writeme.com>
-Format 3
+Format 4
Input article
Preamble
# Hebrew letter textclass definition file.
# Author: Dekel Tsur <dekel@math.tau.ac.il>
-Format 3
+Format 4
Input letter
# Based on course given by Lars Davidson
-Format 3
+Format 4
Columns 1
Sides 1
SecNumDepth 2
#
# Version 1 2006-04-09 - First version, for LyX 1.4.0.
-Format 3
+Format 4
Input stdclass.inc
Input numarticle.inc
# Version 3 2006-04-09 - Updated for LyX 1.4.0; all environments defined by
# ijmpd are now supported by LyX.
-Format 3
+Format 4
Input stdclass.inc
Input numarticle.inc
# Heavily modifed and enhanced by serveral developers.
# Input general definitions
-Format 3
+Format 4
Input stdclass.inc
Sides 2
Columns 2
# AGUplus JGR textclass definition file.
# Author: Martin Vermeer <martin.vermeer@hut.fi>
-Format 3
+Format 4
Input aguplus.inc
ClassOptions
# 2003-03-03 Updated for lyx 1.3.0.
-Format 3
+Format 4
Columns 1
Sides 2
SecNumDepth 4
# Latex8 textclass definition file.
# Author : Allan Rae <rae@elec.uq.edu.au>
-Format 3
+Format 4
Preamble
\usepackage{latex8}
\usepackage{times}
# Author : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
# Heavily modifed and enhanced by serveral developers.
-Format 3
+Format 4
Input stdletter.inc
Input stdlists.inc
Input lyxmacros.inc
# literate-article textclass definition file.
# Author : Edmar Wienskoski Jr. <edmar-w-jr@technologist.com>
-Format 3
+Format 4
Preamble
\usepackage{noweb}
EndPreamble
# literate-book textclass definition file.
# Author : Edmar Wienskoski Jr. <edmar-w-jr@technologist.com>
-Format 3
+Format 4
Preamble
\usepackage{noweb}
EndPreamble
# literate-report textclass definition file.
# Author : Edmar Wienskoski Jr. <edmar-w-jr@technologist.com>
-Format 3
+Format 4
Preamble
\usepackage{noweb}
EndPreamble
# resembles more closely the produced paper doc (more WYSIWYG)
#
-Format 3
+Format 4
OutputType literate
Style Scrap
# Modified for LyX 12 by Jean-Marc Lasgouttes and MV.
-Format 3
+Format 4
Columns 1
Sides 1
PageStyle Plain
# Author : Herbert Voss <voss@perce.de> 2001/08/13
-Format 3
+Format 4
Columns 2
Sides 2
#SecNumDepth # no counting
# be removed later.
-Format 3
+Format 4
Style LyX-Code
Margin Static
LatexType Environment
# Author : José Matos <jamatos@novalis.fc.up.pt>
-Format 3
+Format 4
Columns 1
Sides 1
PageStyle Plain
# feel free to contribute missing features!
-Format 3
+Format 4
Columns 1
Sides 2
SecNumDepth 2
TocDepth 2
DefaultStyle Standard
PageStyle Headings
-ProvidesMakeidx 1
+Provides makeidx 1
ClassOptions
# General textclass parameters
- Format 3
+Format 4
Columns 1
Sides 1
SecNumDepth -1
# Transposed by Tomasz £uczak <tlu@technodat.com.pl>
# Heavily modifed and enhanced by several developers.
-Format 3
+Format 4
Input stdclass.inc
NoStyle Chapter
# Transposed by Tomasz £uczak <tlu@technodat.com.pl>
# Heavily modifed and enhanced by serveral developers.
-Format 3
+Format 4
Input stdclass.inc
Sides 2
# Transposed by Tomasz £uczak <tlu@technodat.com.pl>
# Heavily modifed and enhanced by serveral developers.
-Format 3
+Format 4
Input stdclass.inc
# Author : André Pönitz
# This include file contains label definitions for an article-like numbering.
-Format 3
+Format 4
Style Part
LabelType Counter
LabelCounter part
# Author : André Pönitz
# This include file contains label definitions for a report-like numbering.
-Format 3
+Format 4
Input numarticle.inc
Style Part
# This include files contains label definitions for a article-like numbering.
-Format 3
+Format 4
Style Section
LabelType Counter
LabelCounter section
# Created by Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr)
-Format 3
+Format 4
Columns 1
Sides 1
SecNumDepth 3
# Transposed by Pascal André <andre@via.ecp.fr>
# Heavily modifed and enhanced by serveral developers.
-Format 3
+Format 4
Input stdclass.inc
Input numreport.inc
# Amir Karger (LyX v11.34 style modifications - using changes
# made by Jean-Marc Lasgouttes to amsart.layout)
-Format 3
+Format 4
Columns 1
Sides 1
PageStyle Headers
# Amir Karger (RevTeX 4 beta) 9/1999, 7/2000
-Format 3
+Format 4
Columns 1
Sides 1
PageStyle Headers
-ProvidesNatbib 1
-ProvidesUrl 1
+Provides natbib 1
+Provides url 1
# Default textclass options. The user may need to modify this.
ClassOptions
# KOMA scrartcl textclass definition file.
# Bernd Rellermeyer <100.41728@germanynet.de>, 1998/7/11.
-Format 3
+Format 4
Input scrclass.inc
SecNumDepth 3
# KOMA scrbook textclass definition file.
# Bernd Rellermeyer <100.41728@germanynet.de>, 1998/7/11.
-Format 3
+Format 4
Input scrclass.inc
Input numreport.inc
# Guenter Milde <g.milde web.de>
-Format 3
+Format 4
SecNumDepth 2
TocDepth 2
DefaultStyle Standard
# KOMA scrlettr textclass definition file.
# Bernd Rellermeyer <100.41728@germanynet.de>, 1999/2/17.
-Format 3
+Format 4
Style Standard
LatexName dummy
ParSep 0.4
# KOMA scrlettr2 textclass definition file.
# Juergen Spitzmueller <j.spitzmueller@gmx.de>, 2003/2/17.
-Format 3
+Format 4
Style Standard
LatexName dummy
ParSep 0.4
# KOMA scrreprt textclass definition file.
# Bernd Rellermeyer <100.41728@germanynet.de>, 1998/7/11.
-Format 3
+Format 4
Input scrclass.inc
Input numreport.inc
# Initial attemt at makeing a LyX layout file for the seminar class.
# Author : Lars Gullik Bjønnes <larsbj@lyx.org>
-Format 3
+Format 4
Input stdclass.inc
NoStyle Chapter
# Cut & paste from various LyX layouts plus some minor modifications
# Author : Kornelia Pietsch <pietsch@mathematik.tu-chemnitz.de>
-Format 3
+Format 4
Columns 1
Sides 1
SecNumDepth 2
#
-Format 3
+Format 4
Columns 1
Sides 1
PageStyle Plain
# to be used with the spie.cls LaTex-style available at
# http://public.lanl.gov/kmh/spie/
-Format 3
+Format 4
Input stdclass.inc
NoStyle Chapter
# ``standard'' layouts, like article and friends.
-Format 3
+Format 4
Columns 1
Sides 1
SecNumDepth 2
# in most LyX layouts.
-Format 3
+Format 4
Counter
Name part
End
# in most LyX layouts.
-Format 3
+Format 4
Float
Type table
GuiName Table
# quotations and such.
-Format 3
+Format 4
Style Quotation
Margin Static
LatexType Environment
# Heavily modifed and enhanced by several developers.
-Format 3
+Format 4
Columns 1
Sides 1
PageStyle Empty
# This include files contains various standard environments for lists.
-Format 3
+Format 4
Style Itemize
Margin Static
LatexType Item_Environment
# commands that are useful for article-like document classes, but not
# for letters.
-Format 3
+Format 4
Style Part
Margin Dynamic
LatexType Command
# modifying the style of the regular sectioning layouts.
-Format 3
+Format 4
Style Part*
CopyStyle Part
Margin Static
# a document, like abstract, bibliography and such.
-Format 3
+Format 4
Style Abstract
Margin Static
LatexType Environment
# a document, like title, author and such.
-Format 3
+Format 4
Style Title
Margin Static
LatexType Command
# see www.springer.de/author/tex/help-journals.html for class files
#
# The standard Springer Journal sections
-Format 3
+Format 4
Input svjour.inc
ClassOptions
# see www.springer.de/author/tex/help-journals.html for class files
-Format 3
+Format 4
Input svjour.inc
# see www.springer.de/author/tex/help-journals.html for class files
-Format 3
+Format 4
Columns 2
Sides 1
PageStyle Plain
# see www.springer.de/author/tex/help-journals.html for class files
-Format 3
+Format 4
Input svjour.inc
ClassOptions
re_CopyStyle = re.compile(r'^(\s*)(CopyStyle)(\s+)(\S+)', re.IGNORECASE)
re_NoStyle = re.compile(r'^(\s*)(NoStyle)(\s+)(\S+)', re.IGNORECASE)
re_End = re.compile(r'^(\s*)(End)(\s*)$', re.IGNORECASE)
+ re_Provides = re.compile(r'^(\s*)Provides(\S+)(\s+)(\S+)', re.IGNORECASE)
# counters for sectioning styles (hardcoded in 1.3)
counters = {"part" : "\\Roman{part}",
match = re_Format.match(lines[i])
if match:
format = int(match.group(4))
- if format == 2:
- lines[i] = "Format 3"
+ if format > 1 and format < 4:
+ lines[i] = "Format %d" % (format + 1)
only_comment = 0
- elif format == 3:
+ elif format == 4:
# nothing to do
return format
else:
i = i + 1
continue
+ if format == 3:
+ # convert 'providesamsmath x', 'providesmakeidx x', 'providesnatbib x', 'providesurl x' to
+ # 'provides amsmath x', 'provides makeidx x', 'provides natbib x', 'provides url x'
+ # x is either 0 or 1
+ match = re_Provides.match(lines[i])
+ if match:
+ lines[i] = "%sProvides %s%s%s" % (match.group(1), match.group(2).lower(),
+ match.group(3), match.group(4))
+ i = i + 1
+ continue
+
if format == 2:
caption = []
# Do the real work
lines = read(input)
format = 1
- while (format < 3):
+ while (format < 4):
format = convert(lines)
write(output, lines)
}
+bool LaTeXFeatures::mustProvide(string const & name) const
+{
+ return isRequired(name) && !params_.getLyXTextClass().provides(name);
+}
+
+
bool LaTeXFeatures::isAvailable(string const & name)
{
if (packages_.empty())
// packages which we just \usepackage{package}
//
for (int i = 0; i < nb_simplefeatures; ++i) {
- if (isRequired(simplefeatures[i]))
+ if (mustProvide(simplefeatures[i]))
packages << "\\usepackage{"
<< simplefeatures[i] << "}\n";
}
// than those above.
//
- if (isRequired("amsmath")
- && !tclass.provides(LyXTextClass::amsmath)
+ if (mustProvide("amsmath")
&& params_.use_amsmath != BufferParams::package_off) {
packages << "\\usepackage{amsmath}\n";
}
// esint is used, since esint redefines all relevant integral
// symbols from wasysym and amsmath.
// See http://bugzilla.lyx.org/show_bug.cgi?id=1942
- if (isRequired("wasysym") && isRequired("esint") &&
+ if (mustProvide("wasysym") && isRequired("esint") &&
params_.use_esint != BufferParams::package_off)
packages << "\\usepackage{wasysym}\n";
// color.sty
- if (isRequired("color")) {
+ if (mustProvide("color")) {
if (params_.graphicsDriver == "default")
packages << "\\usepackage{color}\n";
else
// makeidx.sty
if (isRequired("makeidx")) {
- if (!tclass.provides(LyXTextClass::makeidx))
+ if (!tclass.provides("makeidx"))
packages << "\\usepackage{makeidx}\n";
packages << "\\makeindex\n";
}
// graphicx.sty
- if (isRequired("graphicx") && params_.graphicsDriver != "none") {
+ if (mustProvide("graphicx") && params_.graphicsDriver != "none") {
if (params_.graphicsDriver == "default")
packages << "\\usepackage{graphicx}\n";
else
<< "]{graphicx}\n";
}
// shadecolor for shaded
- if (isRequired("framed")) {
+ if (mustProvide("framed")) {
RGBColor c = RGBColor(lcolor.getX11Name(LColor::shadedbg));
packages << "\\definecolor{shadecolor}{rgb}{"
<< c.r/255 << ',' << c.g/255 << ',' << c.b/255 << "}\n";
}
- //if (algorithm) {
- // packages << "\\usepackage{algorithm}\n";
- //}
-
// lyxskak.sty --- newer chess support based on skak.sty
- if (isRequired("chess")) {
+ if (mustProvide("chess")) {
packages << "\\usepackage[ps,mover]{lyxskak}\n";
}
}
// amssymb.sty
- if (isRequired("amssymb") || params_.use_amsmath == BufferParams::package_on)
+ if (mustProvide("amssymb")
+ || params_.use_amsmath == BufferParams::package_on)
packages << "\\usepackage{amssymb}\n";
// esint must be after amsmath and wasysym, since it will redeclare
// inconsistent integral symbols
- if (isRequired("esint") && params_.use_esint != BufferParams::package_off)
+ if (mustProvide("esint")
+ && params_.use_esint != BufferParams::package_off)
packages << "\\usepackage{esint}\n";
// url.sty
- if (isRequired("url") && ! tclass.provides(LyXTextClass::url))
+ if (mustProvide("url"))
packages << "\\IfFileExists{url.sty}{\\usepackage{url}}\n"
" {\\newcommand{\\url}{\\texttt}}\n";
- // float.sty
// natbib.sty
- if (isRequired("natbib") && ! tclass.provides(LyXTextClass::natbib)) {
+ if (mustProvide("natbib")) {
packages << "\\usepackage[";
if (params_.getEngine() == biblio::ENGINE_NATBIB_NUMERICAL) {
packages << "numbers";
}
// jurabib -- we need version 0.6 at least.
- if (isRequired("jurabib")) {
+ if (mustProvide("jurabib")) {
packages << "\\usepackage{jurabib}[2004/01/25]\n";
}
// bibtopic -- the dot provides the aux file naming which
// LyX can detect.
- if (isRequired("bibtopic")) {
+ if (mustProvide("bibtopic")) {
packages << "\\usepackage[dot]{bibtopic}\n";
}
- if (isRequired("xy"))
+ if (mustProvide("xy"))
packages << "\\usepackage[all]{xy}\n";
- if (isRequired("nomencl")) {
+ if (mustProvide("nomencl")) {
packages << "\\usepackage{nomencl}[2005/09/22]\n"
<< "\\makenomenclature\n";
}
macros << *pit << '\n';
}
- if (isRequired("LyX"))
+ if (mustProvide("LyX"))
macros << lyx_def << '\n';
- if (isRequired("lyxline"))
+ if (mustProvide("lyxline"))
macros << lyxline_def << '\n';
- if (isRequired("noun"))
+ if (mustProvide("noun"))
macros << noun_def << '\n';
- if (isRequired("lyxarrow"))
+ if (mustProvide("lyxarrow"))
macros << lyxarrow_def << '\n';
// quotes.
- if (isRequired("quotesinglbase"))
+ if (mustProvide("quotesinglbase"))
macros << quotesinglbase_def << '\n';
- if (isRequired("quotedblbase"))
+ if (mustProvide("quotedblbase"))
macros << quotedblbase_def << '\n';
- if (isRequired("guilsinglleft"))
+ if (mustProvide("guilsinglleft"))
macros << guilsinglleft_def << '\n';
- if (isRequired("guilsinglright"))
+ if (mustProvide("guilsinglright"))
macros << guilsinglright_def << '\n';
- if (isRequired("guillemotleft"))
+ if (mustProvide("guillemotleft"))
macros << guillemotleft_def << '\n';
- if (isRequired("guillemotright"))
+ if (mustProvide("guillemotright"))
macros << guillemotright_def << '\n';
// Math mode
- if (isRequired("boldsymbol") && !isRequired("amsmath"))
+ if (mustProvide("boldsymbol") && !isRequired("amsmath"))
macros << boldsymbol_def << '\n';
- if (isRequired("binom") && !isRequired("amsmath"))
+ if (mustProvide("binom") && !isRequired("amsmath"))
macros << binom_def << '\n';
- if (isRequired("mathcircumflex"))
+ if (mustProvide("mathcircumflex"))
macros << mathcircumflex_def << '\n';
// other
- if (isRequired("ParagraphLeftIndent"))
+ if (mustProvide("ParagraphLeftIndent"))
macros << paragraphleftindent_def;
- if (isRequired("NeedLyXFootnoteCode"))
+ if (mustProvide("NeedLyXFootnoteCode"))
macros << floatingfootnote_def;
// some problems with tex->html converters
- if (isRequired("NeedTabularnewline"))
+ if (mustProvide("NeedTabularnewline"))
macros << tabularnewline_def;
// greyedout environment (note inset)
- if (isRequired("lyxgreyedout"))
+ if (mustProvide("lyxgreyedout"))
macros << lyxgreyedout_def;
- if (isRequired("lyxdot"))
+ if (mustProvide("lyxdot"))
macros << lyxdot_def << '\n';
// floats
// Definition of entities used in the document that are LyX related.
odocstringstream entities;
- if (isRequired("lyxarrow")) {
+ if (mustProvide("lyxarrow")) {
entities << "<!ENTITY lyxarrow \"->\">" << '\n';
}
static void getAvailable();
/// Is the (required) package available?
static bool isAvailable(std::string const & name);
- /// Is the package required?
+ /// Has the package been required?
bool isRequired(std::string const & name) const;
+ /* Is it necessary to load the package? This is true is
+ isRequired is true and the feature is not provided by the
+ textclass.
+ */
+ bool mustProvide(std::string const & name) const;
///
void useFloat(std::string const & name);
///
// AMS Style is at document level
if (params().use_amsmath == BufferParams::package_on
- || tclass.provides(LyXTextClass::amsmath))
+ || tclass.provides("amsmath"))
features.require("amsmath");
if (params().use_esint == BufferParams::package_on)
features.require("esint");
{
// FIXME the class should provide the numerical/
// authoryear choice
- if (getLyXTextClass().provides(LyXTextClass::natbib)
+ if (getLyXTextClass().provides("natbib")
&& cite_engine_ != biblio::ENGINE_NATBIB_NUMERICAL)
return biblio::ENGINE_NATBIB_AUTHORYEAR;
return cite_engine_;
};
-int const FORMAT = 3;
+int const FORMAT = 4;
bool layout2layout(FileName const & filename, FileName const & tempfile)
defaultfont_ = LyXFont(LyXFont::ALL_SANE);
opt_fontsize_ = "10|11|12";
opt_pagestyle_ = "empty|plain|headings|fancy";
- provides_ = nothing;
titletype_ = TITLE_COMMAND_AFTER;
titlename_ = "maketitle";
loaded_ = false;
TC_TOCDEPTH,
TC_CLASSOPTIONS,
TC_PREAMBLE,
- TC_PROVIDESAMSMATH,
- TC_PROVIDESNATBIB,
- TC_PROVIDESMAKEIDX,
- TC_PROVIDESURL,
+ TC_PROVIDES,
TC_LEFTMARGIN,
TC_RIGHTMARGIN,
TC_FLOAT,
{ "outputtype", TC_OUTPUTTYPE },
{ "pagestyle", TC_PAGESTYLE },
{ "preamble", TC_PREAMBLE },
- { "providesamsmath", TC_PROVIDESAMSMATH },
- { "providesmakeidx", TC_PROVIDESMAKEIDX },
- { "providesnatbib", TC_PROVIDESNATBIB },
- { "providesurl", TC_PROVIDESURL },
+ { "provides", TC_PROVIDES },
{ "rightmargin", TC_RIGHTMARGIN },
{ "secnumdepth", TC_SECNUMDEPTH },
{ "sides", TC_SIDES },
preamble_ = from_utf8(lexrc.getLongString("EndPreamble"));
break;
- case TC_PROVIDESAMSMATH:
- if (lexrc.next() && lexrc.getInteger())
- provides_ |= amsmath;
- break;
-
- case TC_PROVIDESNATBIB:
- if (lexrc.next() && lexrc.getInteger())
- provides_ |= natbib;
- break;
-
- case TC_PROVIDESMAKEIDX:
- if (lexrc.next() && lexrc.getInteger())
- provides_ |= makeidx;
- break;
-
- case TC_PROVIDESURL:
- if (lexrc.next() && lexrc.getInteger())
- provides_ |= url;
+ case TC_PROVIDES: {
+ lexrc.next();
+ string const feature = lexrc.getString();
+ lexrc.next();
+ if (lexrc.getInteger())
+ provides_.insert(feature);
+ else
+ provides_.erase(feature);
break;
+ }
case TC_LEFTMARGIN: // left margin type
if (lexrc.next())
}
-bool LyXTextClass::provides(LyXTextClass::Provides p) const
+bool LyXTextClass::provides(string const & p) const
{
- return provides_ & p;
+ return provides_.find(p) != provides_.end();
}
#include <boost/shared_ptr.hpp>
#include <vector>
-
+#include <set>
namespace lyx {
///
docstring const & preamble() const;
- /// Packages that are already loaded by the class
- enum Provides {
- ///
- nothing = 0,
- ///
- amsmath = 1,
- ///
- makeidx = 2,
- ///
- url = 4,
- ///
- natbib = 8
- };
- ///
- bool provides(Provides p) const;
+ /// is this feature already provided by the class?
+ bool provides(std::string const & p) const;
///
unsigned int columns() const;
/// preamble text to support layout styles
docstring preamble_;
/// latex packages loaded by document class.
- Provides provides_;
+ std::set<std::string> provides_;
///
unsigned int columns_;
///
};
-/// Merge two different provides flags into one bit field record
-inline
-void operator|=(LyXTextClass::Provides & p1, LyXTextClass::Provides p2)
-{
- p1 = static_cast<LyXTextClass::Provides>(p1 | p2);
-}
-
-
/// convert page sides option to text 1 or 2
std::ostream & operator<<(std::ostream & os, LyXTextClass::PageSides p);
projects / features.git / commitdiff