]> git.lyx.org Git - features.git/commitdiff
drop linuxdoc support (part 4)
authorMichael Schmitt <michael.schmitt@teststep.org>
Wed, 23 Aug 2006 11:16:08 +0000 (11:16 +0000)
committerMichael Schmitt <michael.schmitt@teststep.org>
Wed, 23 Aug 2006 11:16:08 +0000 (11:16 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14821 a592a061-630c-0410-9148-cb99ea01b6c8

13 files changed:
development/FORMAT
development/scons/scons_manifest.py
lib/Makefile.am
lib/examples/linuxdoc_manpage.lyx [deleted file]
lib/external_templates
lib/layouts/linuxdoc.layout [deleted file]
lib/templates/linuxdoc_article.lyx [deleted file]
po/POTFILES.in
src/Makefile.am
src/paragraph.C
src/paragraph.h
src/tabular.C
src/tabular.h

index 314f9b0b20a454676b957bcbe013d30de1d3f0f0..aa8f8232c1081f42773a67ce93027297d36016bf 100644 (file)
@@ -315,7 +315,7 @@ Paragraph text.
        extra LaTeX "draft"             'extra' data passed to the primary
                                        command for this output format.
                                        (Possible formats LaTeX, PDFLaTeX,
-                                        LinuxDoc, DocBook, Ascii.)
+                                        DocBook, Ascii.)
                                        The string can contain spaces and so
                                        is wrapped in "...".
        rotateAngle 30                  Rotation of the data.
index 89504ad813ead63e114c281fbe4533c83a9b7426..0d3ed613be405731e80f60e0b8112e5583fc16bb 100644 (file)
@@ -1483,7 +1483,6 @@ src_header_files = Split('''
     output.h
     output_docbook.h
     output_latex.h
-    output_linuxdoc.h
     output_plaintext.h
     outputparams.h
     paper.h
@@ -1590,7 +1589,6 @@ src_pre_files = Split('''
     output.C
     output_docbook.C
     output_latex.C
-    output_linuxdoc.C
     output_plaintext.C
     outputparams.C
     paragraph.C
@@ -1747,7 +1745,6 @@ lib_examples_files = Split('''
     it_ItemizeBullets.lyx
     it_splash.lyx
     landslide.lyx
-    linuxdoc_manpage.lyx
     listerrors.lyx
     mathed.lyx
     multicol.lyx
@@ -2453,7 +2450,6 @@ lib_layouts_files = Split('''
     kluwer.layout
     latex8.layout
     letter.layout
-    linuxdoc.layout
     literate-article.layout
     literate-book.layout
     literate-report.layout
@@ -2540,7 +2536,6 @@ lib_templates_files = Split('''
     koma-letter2.lyx
     latex8.lyx
     letter.lyx
-    linuxdoc_article.lyx
     revtex.lyx
     revtex4.lyx
     slides.lyx
index c992a754f338076ae53425bf48f0826db5607d7c..8b3b5c8da0020354c8fab6d75f1a501e510a33cd 100644 (file)
@@ -116,7 +116,6 @@ dist_examples_DATA = \
        examples/it_ItemizeBullets.lyx \
        examples/it_splash.lyx \
        examples/landslide.lyx \
-       examples/linuxdoc_manpage.lyx \
        examples/listerrors.lyx \
        examples/mathed.lyx \
        examples/multicol.lyx \
@@ -818,7 +817,6 @@ dist_layouts_DATA =\
        layouts/kluwer.layout \
        layouts/latex8.layout \
        layouts/letter.layout \
-       layouts/linuxdoc.layout \
        layouts/literate-article.layout \
        layouts/literate-book.layout \
        layouts/literate-report.layout \
@@ -904,7 +902,6 @@ dist_templates_DATA = \
        templates/koma-letter2.lyx \
        templates/latex8.lyx \
        templates/letter.lyx \
-       templates/linuxdoc_article.lyx \
        templates/revtex.lyx \
        templates/revtex4.lyx \
        templates/slides.lyx \
diff --git a/lib/examples/linuxdoc_manpage.lyx b/lib/examples/linuxdoc_manpage.lyx
deleted file mode 100644 (file)
index 56655bb..0000000
+++ /dev/null
@@ -1,257 +0,0 @@
-#LyX 1.5.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 245
-\begin_document
-\begin_header
-\textclass manpage
-\options title="LyX" sectnum="1"
-\language english
-\inputencoding default
-\fontscheme default
-\graphics default
-\paperfontsize 10
-\spacing single
-\papersize default
-\use_geometry false
-\use_amsmath 0
-\cite_engine basic
-\use_bibtopic false
-\paperorientation portrait
-\secnumdepth -2
-\tocdepth -1
-\paragraph_separation indent
-\defskip medskip
-\quotes_language english
-\papercolumns 1
-\papersides 1
-\paperpagestyle default
-\tracking_changes false
-\output_changes true
-\end_header
-
-\begin_body
-
-\begin_layout Section
-
-Name
-\end_layout
-
-\begin_layout Standard
-
-lyx - A Document Processor
-\end_layout
-
-\begin_layout Section
-
-Synopsis
-\end_layout
-
-\begin_layout Standard
-
-lyx [ command-line switches] [name.lyx ...
- ] 
-\end_layout
-
-\begin_layout Section
-
-Description
-\end_layout
-
-\begin_layout Standard
-
-
-\emph on
-LyX
-\emph default
- is too complex to be described completely in the "man" page format.
- If your system is properly configured, you can access the full documentation
- within 
-\emph on
-LyX
-\emph default
- under the Help menu.
-\end_layout
-
-\begin_layout Standard
-
-
-\emph on
-LyX
-\emph default
- is a modern approach of writing documents with a computer which breaks
- with the tradition of the obsolete typewriter concept.
- It is designed for people who want a professional output with a minimum
- of time effort, without becoming specialists in typesetting.
- Compared to common word processors, 
-\emph on
-LyX
-\emph default
- will increase the productivity a lot, since most of the typesetting will
- be done by the computer, not the author.
- With 
-\emph on
-LyX
-\emph default
- the author can concentrate on the contents of his writing, since the computer
- will take care of the look.
- Read more about this concept in the online documentation under the Help
- menu.
-\end_layout
-
-\begin_layout Standard
-
-Currently, 
-\emph on
-LyX
-\emph default
- uses the XForms library as a toolkit.
-\emph on
-LyX
-\emph default
- should run everywhere, where XForms runs.
- This is on all major Unix platforms as well as some PC platforms, including
- Sun, SGI, HP, Compaq Tru64, IBM RS6000, Convex, Cray, i386/Linux, Alpha/Linux,
- i386/FreeBSD, i386/NetBSD, DecSystem(mips)/Ultrix, OS/2 with XFree or PMX
- and others.
-\end_layout
-
-\begin_layout Section
-
-Options
-\end_layout
-
-\begin_layout Standard
-
-
-\emph on
-LyX
-\emph default
- supports the following command-line switches, which can also be specified
- as X resources (e.
- g.
- in .Xdefaults) with class name 
-\emph on
-LyX
-\emph default
-: 
-\end_layout
-
-\begin_layout Description
-
--help summarizes LyX usage
-\end_layout
-
-\begin_layout Description
-
--sysdir directory sets system directory.
- Normally not needed.
-\end_layout
-
-\begin_layout Description
-
--userdir directory sets user directory.
- Needed if you want to use LyX with different lyxrc settings.
-\end_layout
-
-\begin_layout Description
-
--geometry WxH+X+Y specifies the preferred size and position of the main
- LyX window; see X(1).
-\end_layout
-
-\begin_layout Description
-
--dbg feature[,feature...] where feature is a name or number.
- Use "lyx -dbg" to see the list of available debug features.
-\end_layout
-
-\begin_layout Description
-
--x [--execute] command where command is a lyx command.
-\end_layout
-
-\begin_layout Description
-
--e [--export] fmt where fmt is the export format of choice.
-\end_layout
-
-\begin_layout Description
-
--i [--import] fmt file.xxx where fmt is the import format of choice and file.xxx
- is the file to be imported.
-\end_layout
-
-\begin_layout Standard
-
-Furthermore, LyX understands the following generic command line options
- from the Forms Library: 
-\end_layout
-
-\begin_layout Description
-
--display host:display specifies the server to connect to.
-\end_layout
-
-\begin_layout Description
-
--bw borderwidth specifies the border width to use to built-in objects.
-\end_layout
-
-\begin_layout Description
-
--visual visualName requests a visual by name such as TrueColor etc.
- By default the Forms Library always selects the visual that has the most
- depth.
-\end_layout
-
-\begin_layout Description
-
--depth depth requests a specific depth.
- Try "-depth best" or "-depth 8" if you get a bad match.
-\end_layout
-
-\begin_layout Description
-
--debug level generates some info about the state of the XForms.
- where level is an integer between 1-5 and controls the amount of information
- to output.
- Depending on the options used when the Forms Library was built, a level
- more than 3 might not be available.
-\end_layout
-
-\begin_layout Description
-
--sync runs the application in synchronous mode with debug level set to 4.
-\end_layout
-
-\begin_layout Description
-
--private requests a private colormap for the application.
-\end_layout
-
-\begin_layout Description
-
--shared requests a shared colormap even if the application needs more colors
- than available.
- For those colors that can't be allocated in the shared colormap, substitutions
- are made so the closest matching color is used.
-\end_layout
-
-\begin_layout Description
-
--stdcmap requests a standard colormap.
-\end_layout
-
-\begin_layout Description
-
--name newname specifies the application name under which resources are to
- be obtained, rather than the default executable file name.
-\end_layout
-
-\end_body
-\end_document
index f6ad4cce230ad26f57c54de45514178f9c46261b..b3393ad010ba6ce139e000ddf0953fe845d2644d 100644 (file)
@@ -96,9 +96,6 @@ Template RasterImage
                ReferencedFile docbook     "$$AbsPath$$Basename.eps"
                ReferencedFile docbook-xml "$$AbsPath$$Basename.eps"
        FormatEnd
-       Format LinuxDoc
-               Product "[Bitmap: $$FName]"
-       FormatEnd
 TemplateEnd
 
 
@@ -151,9 +148,6 @@ Template XFig
                ReferencedFile docbook     "$$AbsPath$$Basename.eps"
                ReferencedFile docbook-xml "$$AbsPath$$Basename.eps"
        FormatEnd
-       Format LinuxDoc
-               Product "[XFig: $$FName]"
-       FormatEnd
 TemplateEnd
 
 
@@ -199,9 +193,6 @@ Template ChessDiagram
        Format DocBook
                Product "[Chess: $$AbsOrRelPathMaster$$Basename]"
        FormatEnd
-       Format LinuxDoc
-               Product "[Chess: $$FName]"
-       FormatEnd
 TemplateEnd
 
 
@@ -234,9 +225,4 @@ Template Date
                UpdateFormat dateout
                UpdateResult "$$Tempname"
        FormatEnd
-       Format LinuxDoc
-               Product "$$Contents(\"$$Tempname\")"
-               UpdateFormat dateout
-               UpdateResult "$$Tempname"
-       FormatEnd
 TemplateEnd
diff --git a/lib/layouts/linuxdoc.layout b/lib/layouts/linuxdoc.layout
deleted file mode 100644 (file)
index 3906753..0000000
+++ /dev/null
@@ -1,352 +0,0 @@
-#% Do not delete the line below; configure depends on this
-#  \DeclareLinuxDocClass[article]{LinuxDoc article (SGML)}
-# LinuxDoc textclass definition file.
-# Author : Pascal AndrĂ© <andre@via.ecp.fr>
-
-
-Format 2
-Columns                 1
-Sides                   1
-PageStyle               Plain
-OutputType              linuxdoc
-DefaultStyle            Standard
-
-ClassOptions
-    Header              "<!doctype linuxdoc system"
-End
-
-
-Input stdcounters.inc
-Input stdfloats.inc
-Input numarticle.inc
-
-
-Style Standard
-       Margin                Static
-       LatexType             Paragraph
-       LatexName             p
-       ParSkip               0.4
-       Align                 Block
-       AlignPossible         Block
-       LabelType             No_Label
-End
-
-
-Style Quote
-       Margin                Static
-       LatexType             Environment
-       LatexName             quote
-       ParIndent             MM
-       ParSkip               0.4
-       Align                 Block
-       AlignPossible         Block
-       LabelType             No_Label
-End
-
-
-Style Title
-       Margin                Static
-       LatexType             Paragraph
-       LatexName             title
-       NextNoIndent          1
-       ParSkip               0.4
-       Align                 Center
-       AlignPossible         Block, Center, Left, Right, Center
-       LabelType             No_Label
-       Fill_Top              1
-       Fill_Bottom           1
-       Font
-         Family              Sans
-         Series              Bold
-         Size                Largest
-       EndFont
-       LabelFont
-         Family              Sans
-         Series              Bold
-         Size                Largest
-       EndFont
-End
-
-
-Style Section
-       Margin                Dynamic
-       LatexType             Command
-       LatexName             sect
-       LabelSep              xxx
-       ParSkip               0.4
-       TopSep                1.3
-       BottomSep             0.7
-       ParSep                0.7
-       Align                 Block
-       AlignPossible         Block, Left
-       Font
-         Series              Bold
-         Size                Larger
-       EndFont
-       LabelFont
-         Series              Bold
-         Size                Larger
-       EndFont
-End
-
-
-Style Subsection
-       Margin                Dynamic
-       LatexType             Command
-       LatexName             sect1
-       LabelSep              xxx
-       ParSkip               0.4
-       TopSep                0.9
-       BottomSep             0.5
-       ParSep                0.5
-       Align                 Block
-       AlignPossible         Block, Left
-       Font
-         Series              Bold
-         Size                Large
-       EndFont
-       LabelFont
-         Series              Bold
-         Size                Large
-       EndFont
-End
-
-
-Style Subsubsection
-       Margin                Dynamic
-       LatexType             Command
-       LatexName             sect2
-       LabelSep              xxx
-       ParSkip               0.4
-       TopSep                0.7
-       BottomSep             0.4
-       ParSep                0.4
-       Align                 Block
-       AlignPossible         Block, Left
-       Font
-         Series              Bold
-       EndFont
-       LabelFont
-         Series              Bold
-       EndFont
-End
-
-
-Style Paragraph
-       Margin                Dynamic
-       LatexType             Command
-       LatexName             sect3
-       LabelSep              xxx
-       ParSkip               0.4
-       TopSep                0.4
-       BottomSep             0.4
-       Align                 Block
-       AlignPossible         Block, Left
-       Font
-         Series              Bold
-       EndFont
-       LabelFont
-         Series              Bold
-       EndFont
-End
-
-
-Style Subparagraph
-       CopyStyle             Paragraph
-       LatexName             sect4
-       LeftMargin            MM
-End
-
-
-Style Enumerate
-       Margin                Static
-       LatexType             Item_Environment
-       LatexName             enum
-       LeftMargin            MMN
-       LabelSep              xx
-       ItemSep               0.2
-       TopSep                0.7
-       BottomSep             0.7
-       ParSep                0.3
-       Align                 Block
-       AlignPossible         Block, Left
-       LabelType             Enumerate
-End
-
-
-Style Itemize
-       Margin                Static
-       LatexType             Item_Environment
-       LatexName             itemize
-       LeftMargin            MMN
-       LabelSep              xx
-       ItemSep               0.2
-       TopSep                0.7
-       BottomSep             0.7
-       ParSep                0.3
-       Align                 Block
-       AlignPossible         Block, Left
-       LabelType             Itemize
-       LabelString           "*"
-End
-
-
-Style Description
-       Margin                First_Dynamic
-       LatexType             Item_environment
-       LatexName             descrip
-       LeftMargin            MM
-       LabelSep              xxx
-       ParSkip               0.4
-       ItemSep               0.2
-       TopSep                0.7
-       BottomSep             0.7
-       ParSep                0.3
-       Align                 Block
-       AlignPossible         Block, Left
-       LabelType             Manual
-       LabelString           "MM"
-       LabelFont
-         Series              Bold
-       EndFont
-End
-
-
-Style Verbatim
-       Margin                Static
-       LatexType             environment
-       LatexName             verb
-       LeftMargin            MM
-       LabelSep              xx
-       ItemSep               0.2
-       Topsep                0.7
-       BottomSep             0.7
-       ParSep                0.3
-       Align                 Block
-       AlignPossible         Block
-       FreeSpacing           1
-       LabelType             No_Label
-       Font
-         Family              Typewriter
-       EndFont
-       LabelFont
-         Family              Typewriter
-       EndFont
-End
-
-
-Style Code
-       Margin                Static
-       LatexType             Environment
-       LatexParam            CDATA
-       LatexName             code
-       LeftMargin            MM
-       LabelSep              xx
-       ItemSep               0.2
-       TopSep                0.7
-       BottomSep             0.7
-       ParSep                0.3
-       Align                 Block
-       AlignPossible         Block
-       LabelType             No_Label
-       FreeSpacing           1
-End
-
-
-Style Author
-       Margin                Dynamic
-       LatexType             Paragraph
-       LatexName             author
-       LabelSep              xxx
-       ParSkip               0.4
-       TopSep                1.3
-       BottomSep             0.7
-       ParSep                0.7
-       Align                 Center
-       AlignPossible         Center
-       LabelType             No_Label
-       Font
-         Size                Larger
-       EndFont
-       LabelFont
-         Size                Larger
-       EndFont
-End
-
-
-Style Date
-       Margin                Dynamic
-       LatexType             Paragraph
-       LatexName             date
-       LabelSep              xxx
-       ParSkip               0.4
-       TopSep                0.9
-       BottomSep             0.5
-       ParSep                0.5
-       Align                 Center
-       AlignPossible         Center
-       LabelType             No_Label
-       Font
-         Size                Large
-       EndFont
-       LabelFont
-         Size                Large
-       EndFont
-End
-
-
-Style Abstract
-       Margin                Static
-       LatexType             Paragraph
-       LatexName             abstract
-       LeftMargin            MM
-       LabelSep              xx
-       ItemSep               0
-       TopSep                0.7
-       BottomSep             0.7
-       ParSep                0
-       Align                 Block
-       AlignPossible         Block
-       LabelType             No_Label
-       Font
-         Shape               Italic
-       EndFont
-       LabelFont
-         Shape               Italic
-       EndFont
-End
-
-
-Style SGML
-       Margin                Static
-       LatexType             Paragraph
-       LatexName             "!-- --"
-       NewLine               0
-       ParIndent             MM
-       ParSkip               0.4
-       ParSep                0.5
-       Align                 Left
-       AlignPossible         Block, Left, Right, Center
-       LabelType             No_Label
-       FreeSpacing           1
-       PassThru              1
-End
-
-
-Style Caption
-       Margin                First_Dynamic
-       LatexType             Paragraph
-       LatexName             caption
-       NeedProtect           1
-       LabelSep              xx
-       ParSkip               0.4
-       TopSep                0.5
-       Align                 Center
-       AlignPossible         Center
-       LabelType             Sensitive
-       LabelString           "Caption"
-       OptionalArgs          1
-       LabelFont
-         Series              Bold
-       EndFont
-End
diff --git a/lib/templates/linuxdoc_article.lyx b/lib/templates/linuxdoc_article.lyx
deleted file mode 100644 (file)
index ea96f8c..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-#LyX 1.5.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 245
-\begin_document
-\begin_header
-\textclass linuxdoc
-\language english
-\inputencoding auto
-\fontscheme default
-\graphics default
-\paperfontsize default
-\papersize default
-\use_geometry false
-\use_amsmath 0
-\cite_engine basic
-\use_bibtopic false
-\paperorientation portrait
-\secnumdepth 3
-\tocdepth 3
-\paragraph_separation indent
-\defskip medskip
-\quotes_language english
-\papercolumns 1
-\papersides 1
-\paperpagestyle default
-\tracking_changes false
-\output_changes true
-\end_header
-
-\begin_body
-
-
-\begin_layout Standard
-
-
-\begin_inset VSpace vfill
-\end_inset
-
-
-\end_layout
-
-\begin_layout Title
-
-TITLE
-\end_layout
-
-\begin_layout Standard
-
-
-\begin_inset VSpace vfill
-\end_inset
-
-
-\end_layout
-
-
-\begin_layout Author
-
-AUTHOR 
-\end_layout
-
-\begin_layout Date
-
-DATE
-\end_layout
-
-\begin_layout Abstract
-
-ABSTRACT
-\end_layout
-
-\begin_layout Standard
-
-
-\begin_inset LatexCommand \tableofcontents{}
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-
-First Section
-\end_layout
-
-\end_body
-\end_document
index aa4cdf041d21b609cc66ee0d1e5bc41f147fa0a4..880f3af1acd803e27c04bf50e07d0c4c32704998 100644 (file)
@@ -218,7 +218,6 @@ src/mathed/math_splitinset.C
 src/mathed/math_substackinset.C
 src/mathed/ref_inset.C
 src/output.C
-src/output_linuxdoc.C
 src/output_plaintext.C
 src/paragraph.C
 src/rowpainter.C
index 4364e251185ae27d58c2523e5293aa0cde6c646f..4911718e9676d19346b1e12eab2db563c38df141 100644 (file)
@@ -245,8 +245,6 @@ lyx_SOURCES = \
        output_docbook.h \
        output_latex.C \
        output_latex.h \
-       output_linuxdoc.C \
-       output_linuxdoc.h \
        output_plaintext.C \
        output_plaintext.h \
        paper.h \
index bc2b6ad538a9502fcc459e514ece6674411d1568..6975c091f04510b1fbc97ea793775cbc825b8144 100644 (file)
@@ -1122,201 +1122,6 @@ void reset(PAR_TAG & p1, PAR_TAG const & p2)
 } // anon
 
 
-// Handle internal paragraph parsing -- layout already processed.
-void Paragraph::simpleLinuxDocOnePar(Buffer const & buf,
-                                    ostream & os,
-                                    LyXFont const & outerfont,
-                                    OutputParams const & runparams,
-                                    lyx::depth_type /*depth*/) const
-{
-       LyXLayout_ptr const & style = layout();
-
-       string::size_type char_line_count = 5;     // Heuristic choice ;-)
-
-       // gets paragraph main font
-       LyXFont font_old;
-       bool desc_on;
-       if (style->labeltype == LABEL_MANUAL) {
-               font_old = style->labelfont;
-               desc_on = true;
-       } else {
-               font_old = style->font;
-               desc_on = false;
-       }
-
-       LyXFont::FONT_FAMILY family_type = LyXFont::ROMAN_FAMILY;
-       LyXFont::FONT_SERIES series_type = LyXFont::MEDIUM_SERIES;
-       LyXFont::FONT_SHAPE  shape_type  = LyXFont::UP_SHAPE;
-       bool is_em = false;
-
-       stack<PAR_TAG> tag_state;
-       // parsing main loop
-       for (pos_type i = 0; i < size(); ++i) {
-
-               PAR_TAG tag_close = PAR_NONE;
-               list < PAR_TAG > tag_open;
-
-               LyXFont const font = getFont(buf.params(), i, outerfont);
-
-               if (font_old.family() != font.family()) {
-                       switch (family_type) {
-                       case LyXFont::SANS_FAMILY:
-                               tag_close |= SF;
-                               break;
-                       case LyXFont::TYPEWRITER_FAMILY:
-                               tag_close |= TT;
-                               break;
-                       default:
-                               break;
-                       }
-
-                       family_type = font.family();
-
-                       switch (family_type) {
-                       case LyXFont::SANS_FAMILY:
-                               tag_open.push_back(SF);
-                               break;
-                       case LyXFont::TYPEWRITER_FAMILY:
-                               tag_open.push_back(TT);
-                               break;
-                       default:
-                               break;
-                       }
-               }
-
-               if (font_old.series() != font.series()) {
-                       switch (series_type) {
-                       case LyXFont::BOLD_SERIES:
-                               tag_close |= BF;
-                               break;
-                       default:
-                               break;
-                       }
-
-                       series_type = font.series();
-
-                       switch (series_type) {
-                       case LyXFont::BOLD_SERIES:
-                               tag_open.push_back(BF);
-                               break;
-                       default:
-                               break;
-                       }
-
-               }
-
-               if (font_old.shape() != font.shape()) {
-                       switch (shape_type) {
-                       case LyXFont::ITALIC_SHAPE:
-                               tag_close |= IT;
-                               break;
-                       case LyXFont::SLANTED_SHAPE:
-                               tag_close |= SL;
-                               break;
-                       default:
-                               break;
-                       }
-
-                       shape_type = font.shape();
-
-                       switch (shape_type) {
-                       case LyXFont::ITALIC_SHAPE:
-                               tag_open.push_back(IT);
-                               break;
-                       case LyXFont::SLANTED_SHAPE:
-                               tag_open.push_back(SL);
-                               break;
-                       default:
-                               break;
-                       }
-               }
-               // handle <em> tag
-               if (font_old.emph() != font.emph()) {
-                       if (font.emph() == LyXFont::ON) {
-                               tag_open.push_back(EM);
-                               is_em = true;
-                       }
-                       else if (is_em) {
-                               tag_close |= EM;
-                               is_em = false;
-                       }
-               }
-
-               list < PAR_TAG > temp;
-               while (!tag_state.empty() && tag_close) {
-                       PAR_TAG k =  tag_state.top();
-                       tag_state.pop();
-                       os << "</" << tag_name(k) << '>';
-                       if (tag_close & k)
-                               reset(tag_close,k);
-                       else
-                               temp.push_back(k);
-               }
-
-               for(list< PAR_TAG >::const_iterator j = temp.begin();
-                   j != temp.end(); ++j) {
-                       tag_state.push(*j);
-                       os << '<' << tag_name(*j) << '>';
-               }
-
-               for(list< PAR_TAG >::const_iterator j = tag_open.begin();
-                   j != tag_open.end(); ++j) {
-                       tag_state.push(*j);
-                       os << '<' << tag_name(*j) << '>';
-               }
-
-               value_type c = getChar(i);
-
-
-               if (c == Paragraph::META_INSET) {
-                       getInset(i)->linuxdoc(buf, os, runparams);
-                       font_old = font;
-                       continue;
-               }
-
-               if (style->latexparam() == "CDATA") {
-                       // "TeX"-Mode on == > SGML-Mode on.
-                       if (c != '\0')
-                               os << c;
-                       ++char_line_count;
-               } else {
-                       bool ws;
-                       string str;
-                       boost::tie(ws, str) = sgml::escapeChar(c);
-                       if (ws && !isFreeSpacing()) {
-                               // in freespacing mode, spaces are
-                               // non-breaking characters
-                               if (desc_on) { // if char is ' ' then...
-                                       ++char_line_count;
-                                       sgmlLineBreak(os, char_line_count, 6);
-                                       os << "</tag>";
-                                       desc_on = false;
-                               } else  {
-                                       sgmlLineBreak(os, char_line_count, 1);
-                                       os << c;
-                               }
-                       } else {
-                               os << str;
-                               char_line_count += str.length();
-                       }
-               }
-               font_old = font;
-       }
-
-       while (!tag_state.empty()) {
-               os << "</" << tag_name(tag_state.top()) << '>';
-               tag_state.pop();
-       }
-
-       // resets description flag correctly
-       if (desc_on) {
-               // <tag> not closed...
-               sgmlLineBreak(os, char_line_count, 6);
-               os << "</tag>";
-       }
-}
-
-
 bool Paragraph::emptyTag() const
 {
        for (pos_type i = 0; i < size(); ++i) {
index bab6fb3ce6f5ee54c043c76f13e54807724b620e..c5b4270c3298113b0215705a6b236fbb35515f93 100644 (file)
@@ -146,17 +146,10 @@ public:
                             LyXFont const & outerfont, std::ostream &,
                             TexRow & texrow, OutputParams const &) const;
 
-       /// Writes to stream the content of the paragraph for linuxdoc
-       void simpleLinuxDocOnePar(Buffer const & buf,
-                                 std::ostream & os,
-                                 LyXFont const & outerfont,
-                                 OutputParams const & runparams,
-                                 lyx::depth_type depth) const;
-
        /// Can we drop the standard paragraph wrapper?
        bool emptyTag() const;
 
-       /// Get the id of the paragraph, usefull for docbook and linuxdoc
+       /// Get the id of the paragraph, usefull for docbook
        std::string getID(Buffer const & buf,
                          OutputParams const & runparams) const;
 
index cdfa5e320fe03eadcc71bcbe89268b85c03d417e..60c20f9d55c6b5973153283f58d26c10a9912bd6 100644 (file)
@@ -2262,48 +2262,6 @@ int LyXTabular::latex(Buffer const & buf, ostream & os,
 }
 
 
-int LyXTabular::linuxdoc(Buffer const & buf, ostream & os,
-                        const OutputParams & runparams) const
-{
-       os << "<tabular ca=\"";
-       for (col_type i = 0; i < columns_; ++i) {
-               switch (column_info[i].alignment) {
-               case LYX_ALIGN_LEFT:
-                       os << 'l';
-                       break;
-               case LYX_ALIGN_RIGHT:
-                       os << 'r';
-                       break;
-               default:
-                       os << 'c';
-                       break;
-               }
-       }
-       os << "\">\n";
-       idx_type cell = 0;
-       int ret = 0;
-       for (row_type i = 0; i < rows_; ++i) {
-               for (col_type j = 0; j < columns_; ++j) {
-                       if (isPartOfMultiColumn(i, j))
-                               continue;
-                       shared_ptr<InsetText> inset = getCellInset(cell);
-
-                       ret += inset->linuxdoc(buf, os, runparams);
-
-                       if (isLastCellInRow(cell)) {
-                               os << "@\n";
-                               ++ret;
-                       } else {
-                               os << "|";
-                       }
-                       ++cell;
-               }
-       }
-       os << "</tabular>\n";
-       return ret;
-}
-
-
 int LyXTabular::docbookRow(Buffer const & buf, ostream & os, row_type row,
                           OutputParams const & runparams) const
 {
index 77da49b087b52e6d78e45ad20bd1bd03c4e4968d..6b2fb6afde9a3be5e239dc8f14314500a46f90ae 100644 (file)
@@ -305,9 +305,6 @@ public:
        int latex(Buffer const &, std::ostream &,
                  OutputParams const &) const;
        //
-       int linuxdoc(Buffer const & buf, std::ostream & os,
-                    OutputParams const &) const;
-       ///
        int docbook(Buffer const & buf, std::ostream & os,
                    OutputParams const &) const;
        ///