mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-25 22:06:15 +00:00
(Try to) make LyX work with more than 128 layouts; new LLNCS class; latex log file scanning fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@575 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes
parent
371d623527
commit
a2c6689c71
16
ChangeLog
16
ChangeLog
@ -1,3 +1,19 @@
|
|||||||
|
2000-02-28 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||||
|
|
||||||
|
* src/lyxtext.h: change SetLayout() to take a
|
||||||
|
LyXTextClass::size_type instead of a char (when there is more than
|
||||||
|
127 layouts in a class); also change type of copylayouttype.
|
||||||
|
* src/text2.C (SetLayout): ditto.
|
||||||
|
* src/LyXView.C (updateLayoutChoice): ditto.
|
||||||
|
|
||||||
|
* src/LaTeX.C (scanLogFile): errors where the line number was not
|
||||||
|
given just after the '!'-line were ignored (from Dekel Tsur).
|
||||||
|
|
||||||
|
* lib/lyxrc.example: fix description of \date_insert_format
|
||||||
|
|
||||||
|
* lib/layouts/llncs.layout: new layout, contributed by Martin
|
||||||
|
Vermeer.
|
||||||
|
|
||||||
2000-02-25 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
2000-02-25 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||||
|
|
||||||
* src/insets/insettext.C (LocalDispatch): remove extra break
|
* src/insets/insettext.C (LocalDispatch): remove extra break
|
||||||
|
|||||||
603
lib/layouts/llncs.layout
Normal file
603
lib/layouts/llncs.layout
Normal file
@ -0,0 +1,603 @@
|
|||||||
|
#% Do not delete the line below; configure depends on this
|
||||||
|
# \DeclareLaTeXClass{Springer - Lecture Notes in Comp. Sci.}
|
||||||
|
# llncs (article) textclass definition file.
|
||||||
|
# --------
|
||||||
|
#
|
||||||
|
# Taken from initial LyX source code
|
||||||
|
# Author : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
|
||||||
|
# Transposed by Pascal André <andre@via.ecp.fr>
|
||||||
|
# Heavily modified and enhanced by serveral developers.
|
||||||
|
#
|
||||||
|
# --------
|
||||||
|
# Based on ejour2.layout.
|
||||||
|
# ejour2 made originally by Martin Vermeer based on article.layout.
|
||||||
|
# Modified for LyX 12 by Jean-Marc Lasgouttes and MV.
|
||||||
|
#
|
||||||
|
# General textclass parameters
|
||||||
|
Columns 1
|
||||||
|
Sides 1
|
||||||
|
PageStyle Plain
|
||||||
|
MaxCounter Counter_Section
|
||||||
|
|
||||||
|
# Standard style definition
|
||||||
|
Style Standard
|
||||||
|
Margin Static
|
||||||
|
LatexType Paragraph
|
||||||
|
LatexName dummy
|
||||||
|
ParIndent MM
|
||||||
|
ParSkip 0.4
|
||||||
|
Align Block
|
||||||
|
AlignPossible Block, Left, Right, Center
|
||||||
|
LabelType No_Label
|
||||||
|
End
|
||||||
|
|
||||||
|
# The standard sections
|
||||||
|
Input stdsections.inc
|
||||||
|
|
||||||
|
# Chapter style definition
|
||||||
|
Style Chapter
|
||||||
|
Align Center
|
||||||
|
AlignPossible Block,Left,Center
|
||||||
|
End
|
||||||
|
|
||||||
|
# Section style definition
|
||||||
|
Style Section
|
||||||
|
# standard font definition
|
||||||
|
LabelFont
|
||||||
|
Series Bold
|
||||||
|
Size Large
|
||||||
|
EndFont
|
||||||
|
Font
|
||||||
|
Series Bold
|
||||||
|
Size Large
|
||||||
|
EndFont
|
||||||
|
End
|
||||||
|
|
||||||
|
# Subsection style definition
|
||||||
|
Style Subsection
|
||||||
|
LabelType Counter_Subsection
|
||||||
|
LabelFont
|
||||||
|
Series Bold
|
||||||
|
Size Normal
|
||||||
|
EndFont
|
||||||
|
End
|
||||||
|
|
||||||
|
# Subsubsection style definition
|
||||||
|
Style Subsubsection
|
||||||
|
# standard font definition
|
||||||
|
LabelFont
|
||||||
|
Series Bold
|
||||||
|
Size Normal
|
||||||
|
EndFont
|
||||||
|
End
|
||||||
|
|
||||||
|
# Paragraph style definition
|
||||||
|
Style Paragraph
|
||||||
|
# standard font definition
|
||||||
|
Font
|
||||||
|
Series Medium
|
||||||
|
Shape Italic
|
||||||
|
Size Normal
|
||||||
|
EndFont
|
||||||
|
End
|
||||||
|
|
||||||
|
# Subparagraph style definition
|
||||||
|
Style Subparagraph
|
||||||
|
# standard font definition
|
||||||
|
Font
|
||||||
|
Series Medium
|
||||||
|
Shape Up
|
||||||
|
Size Normal
|
||||||
|
EndFont
|
||||||
|
End
|
||||||
|
|
||||||
|
# Now define the starred versions from the normal ones.
|
||||||
|
Input stdstarsections.inc
|
||||||
|
|
||||||
|
# Remove the ones that we do not want
|
||||||
|
NoStyle Part
|
||||||
|
NoStyle Part*
|
||||||
|
|
||||||
|
# Some standard things
|
||||||
|
Input stdlayouts.inc
|
||||||
|
Input stdlists.inc
|
||||||
|
|
||||||
|
# Standard style definition
|
||||||
|
Style Petit
|
||||||
|
Margin Static
|
||||||
|
LatexType Environment
|
||||||
|
LatexName petit
|
||||||
|
ParIndent MM
|
||||||
|
ParSkip 0.4
|
||||||
|
Align Block
|
||||||
|
AlignPossible Block, Left, Right, Center
|
||||||
|
LabelType No_Label
|
||||||
|
|
||||||
|
# Font definition
|
||||||
|
Font
|
||||||
|
Size Small
|
||||||
|
EndFont
|
||||||
|
End
|
||||||
|
|
||||||
|
# Journal name style definition (not needed if JG option given)
|
||||||
|
Style Journal
|
||||||
|
Margin Static
|
||||||
|
LatexType Command
|
||||||
|
InTitle 1
|
||||||
|
LatexName journalname
|
||||||
|
NextNoIndent 1
|
||||||
|
LeftMargin Journal:xxx
|
||||||
|
LabelSep xxx
|
||||||
|
ParSkip 0.4
|
||||||
|
TopSep 1.3
|
||||||
|
BottomSep 0.7
|
||||||
|
ParSep 0.7
|
||||||
|
Align Left
|
||||||
|
AlignPossible Left
|
||||||
|
LabelType Static
|
||||||
|
LabelString Journal:
|
||||||
|
|
||||||
|
# standard font definition
|
||||||
|
LabelFont
|
||||||
|
Series Bold
|
||||||
|
Shape Italic
|
||||||
|
Color Red
|
||||||
|
EndFont
|
||||||
|
|
||||||
|
End
|
||||||
|
|
||||||
|
# Headnote style definition
|
||||||
|
Style Headnote
|
||||||
|
CopyStyle Journal
|
||||||
|
LatexName dedication
|
||||||
|
LeftMargin "HeadNote (optional):xxx"
|
||||||
|
LabelString "Headnote (optional): "
|
||||||
|
End
|
||||||
|
|
||||||
|
# Title style definition
|
||||||
|
Style Title
|
||||||
|
Margin Static
|
||||||
|
LatexType Command
|
||||||
|
InTitle 1
|
||||||
|
LatexName title
|
||||||
|
NextNoIndent 1
|
||||||
|
ParSkip 0.4
|
||||||
|
TopSep 1.3
|
||||||
|
BottomSep 0.7
|
||||||
|
ParSep 0.7
|
||||||
|
Align Center
|
||||||
|
AlignPossible Block, Center, Left, Right
|
||||||
|
LabelType No_Label
|
||||||
|
Fill_Top 1
|
||||||
|
Fill_Bottom 1
|
||||||
|
|
||||||
|
# standard font definition
|
||||||
|
Font
|
||||||
|
Family Sans
|
||||||
|
Series Bold
|
||||||
|
Size Largest
|
||||||
|
EndFont
|
||||||
|
|
||||||
|
End
|
||||||
|
|
||||||
|
# Title style definition
|
||||||
|
Style Subtitle
|
||||||
|
Margin Static
|
||||||
|
LatexType Command
|
||||||
|
InTitle 1
|
||||||
|
LatexName subtitle
|
||||||
|
NextNoIndent 1
|
||||||
|
ParSkip 0.4
|
||||||
|
ItemSep 0
|
||||||
|
TopSep 0
|
||||||
|
BottomSep 0
|
||||||
|
ParSep 0
|
||||||
|
Align Left
|
||||||
|
AlignPossible Left
|
||||||
|
LabelType No_Label
|
||||||
|
|
||||||
|
# standard font definition
|
||||||
|
Font
|
||||||
|
Family Sans
|
||||||
|
Series Bold
|
||||||
|
Size Large
|
||||||
|
EndFont
|
||||||
|
|
||||||
|
End
|
||||||
|
|
||||||
|
# Translated Title style definition
|
||||||
|
Style Translated_Title
|
||||||
|
Margin Static
|
||||||
|
LatexType Command
|
||||||
|
InTitle 1
|
||||||
|
LatexName transtitle
|
||||||
|
NextNoIndent 1
|
||||||
|
LeftMargin "English title:xxx"
|
||||||
|
LabelSep xxx
|
||||||
|
ParSkip 0.4
|
||||||
|
TopSep 1.3
|
||||||
|
BottomSep 0.7
|
||||||
|
ParSep 0.7
|
||||||
|
Align Left
|
||||||
|
AlignPossible Left
|
||||||
|
LabelType Static
|
||||||
|
LabelString "English title: "
|
||||||
|
|
||||||
|
# Standard font definition
|
||||||
|
Font
|
||||||
|
Series Bold
|
||||||
|
EndFont
|
||||||
|
|
||||||
|
# Label font definition
|
||||||
|
LabelFont
|
||||||
|
Series Bold
|
||||||
|
Shape Italic
|
||||||
|
Color Red
|
||||||
|
EndFont
|
||||||
|
|
||||||
|
End
|
||||||
|
|
||||||
|
# Title_Running style definition
|
||||||
|
Style Running_LaTeX_Title
|
||||||
|
CopyStyle Journal
|
||||||
|
LatexName titlerunning
|
||||||
|
LeftMargin "Running title:xxx"
|
||||||
|
LabelString "Running title: "
|
||||||
|
End
|
||||||
|
|
||||||
|
# TOC_Title style definition
|
||||||
|
Style TOC_Title
|
||||||
|
CopyStyle Journal
|
||||||
|
LatexName toctitle
|
||||||
|
LeftMargin "TOC title:xxx"
|
||||||
|
LabelString "TOC title: "
|
||||||
|
End
|
||||||
|
|
||||||
|
# Author style definition
|
||||||
|
Style Author
|
||||||
|
Margin Static
|
||||||
|
LatexType Command
|
||||||
|
InTitle 1
|
||||||
|
LatexName author
|
||||||
|
NextNoIndent 1
|
||||||
|
ParSkip 0.4
|
||||||
|
TopSep 0.7
|
||||||
|
BottomSep 0.7
|
||||||
|
ItemSep 0
|
||||||
|
ParSep 0
|
||||||
|
Align Left
|
||||||
|
AlignPossible Left
|
||||||
|
LabelType No_Label
|
||||||
|
|
||||||
|
# standard font definition
|
||||||
|
Font
|
||||||
|
Series Bold
|
||||||
|
Shape Italic
|
||||||
|
EndFont
|
||||||
|
|
||||||
|
End
|
||||||
|
|
||||||
|
# AuthorRunning style definition
|
||||||
|
Style Author_Running
|
||||||
|
CopyStyle Journal
|
||||||
|
LatexName authorrunning
|
||||||
|
LeftMargin "Author Running:xxx"
|
||||||
|
LabelString "Author Running: "
|
||||||
|
End
|
||||||
|
|
||||||
|
# TOC_Author style definition
|
||||||
|
Style TOC_Author
|
||||||
|
CopyStyle Journal
|
||||||
|
LatexName tocauthor
|
||||||
|
LeftMargin "TOC Author :xxx"
|
||||||
|
LabelString "TOC Author: "
|
||||||
|
End
|
||||||
|
|
||||||
|
# Institute style definition
|
||||||
|
Style Institute
|
||||||
|
Margin Static
|
||||||
|
LatexType Command
|
||||||
|
InTitle 1
|
||||||
|
LatexName institute
|
||||||
|
NextNoIndent 1
|
||||||
|
ParSkip 0.4
|
||||||
|
TopSep 1.3
|
||||||
|
BottomSep 0.7
|
||||||
|
ParSep 0.7
|
||||||
|
Align Left
|
||||||
|
AlignPossible Left
|
||||||
|
LabelType No_Label
|
||||||
|
|
||||||
|
# Std. font definition
|
||||||
|
Font
|
||||||
|
Size Small
|
||||||
|
EndFont
|
||||||
|
|
||||||
|
End
|
||||||
|
|
||||||
|
# Dedication style definition (optional)
|
||||||
|
Style Dedication
|
||||||
|
CopyStyle Journal
|
||||||
|
LatexName headnote
|
||||||
|
LeftMargin Dedication:xxx
|
||||||
|
LabelString Dedication:
|
||||||
|
End
|
||||||
|
|
||||||
|
# Recieved/Accepted style definition
|
||||||
|
Style Date
|
||||||
|
CopyStyle Journal
|
||||||
|
LatexName date
|
||||||
|
LeftMargin Received/Accepted:xx
|
||||||
|
LabelString Received/Accepted:
|
||||||
|
End
|
||||||
|
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# Correspondence address style definition
|
||||||
|
Style Mail
|
||||||
|
CopyStyle Journal
|
||||||
|
LatexName mail
|
||||||
|
LeftMargin "Corr Author:xx."
|
||||||
|
LabelString "Corr Author: "
|
||||||
|
End
|
||||||
|
|
||||||
|
# Abstract style definition
|
||||||
|
Style Abstract
|
||||||
|
Margin First_Dynamic
|
||||||
|
LatexType Environment
|
||||||
|
LatexName abstract
|
||||||
|
NextNoIndent 0
|
||||||
|
ParIndent MM
|
||||||
|
LabelSep xx
|
||||||
|
ItemSep 0
|
||||||
|
TopSep 0.7
|
||||||
|
BottomSep 0.7
|
||||||
|
ParSep 0
|
||||||
|
Align Block
|
||||||
|
AlignPossible Block, Left
|
||||||
|
LabelType Top_Environment
|
||||||
|
LabelString Abstract.
|
||||||
|
|
||||||
|
# label font definition
|
||||||
|
LabelFont
|
||||||
|
Series Bold
|
||||||
|
EndFont
|
||||||
|
End
|
||||||
|
|
||||||
|
# Keywords style definition
|
||||||
|
Style Keywords
|
||||||
|
Margin First_Dynamic
|
||||||
|
LatexType Command
|
||||||
|
LatexName keywords
|
||||||
|
NextNoIndent 0
|
||||||
|
ParIndent MM
|
||||||
|
LabelSep xx
|
||||||
|
ItemSep 0
|
||||||
|
TopSep 0.7
|
||||||
|
BottomSep 0.7
|
||||||
|
ParSep 0
|
||||||
|
Align Block
|
||||||
|
AlignPossible Block, Left
|
||||||
|
LabelType Static
|
||||||
|
LabelString "Key Words: "
|
||||||
|
|
||||||
|
# label font definition
|
||||||
|
LabelFont
|
||||||
|
Series Bold
|
||||||
|
EndFont
|
||||||
|
End
|
||||||
|
|
||||||
|
# Translated abstract style definition
|
||||||
|
Style TranslatedAbstract
|
||||||
|
CopyStyle Abstract
|
||||||
|
LatexName transsummary
|
||||||
|
LabelString "Eng. Abstract. "
|
||||||
|
End
|
||||||
|
|
||||||
|
# Trans_Keywords style definition
|
||||||
|
Style Trans_Keywords
|
||||||
|
CopyStyle Keywords
|
||||||
|
LatexName trankey
|
||||||
|
LabelString "Eng Key Words: "
|
||||||
|
End
|
||||||
|
|
||||||
|
# Acknowledgement(s) style definitions
|
||||||
|
Style Acknowledgements
|
||||||
|
Margin First_Dynamic
|
||||||
|
LatexType Environment
|
||||||
|
LatexName acknowledgements
|
||||||
|
NextNoIndent 0
|
||||||
|
ParIndent MM
|
||||||
|
LabelSep xx
|
||||||
|
ItemSep 0
|
||||||
|
TopSep 0.7
|
||||||
|
BottomSep 0.7
|
||||||
|
ParSep 0
|
||||||
|
Align Block
|
||||||
|
AlignPossible Block, Left
|
||||||
|
LabelType Static
|
||||||
|
LabelString Acknowledgements.
|
||||||
|
|
||||||
|
# font & label font definition
|
||||||
|
Font
|
||||||
|
Size Small
|
||||||
|
EndFont
|
||||||
|
|
||||||
|
LabelFont
|
||||||
|
Shape Italic
|
||||||
|
Size Small
|
||||||
|
EndFont
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Acknowledgement
|
||||||
|
CopyStyle Acknowledgements
|
||||||
|
LatexName acknowledgement
|
||||||
|
LabelString Acknowledgement.
|
||||||
|
End
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bibliography style definition
|
||||||
|
Style Bibliography
|
||||||
|
Margin First_Dynamic
|
||||||
|
LatexType Item_Environment
|
||||||
|
LatexName lyxbibliography
|
||||||
|
NextNoIndent 1
|
||||||
|
LeftMargin MM
|
||||||
|
ParSkip 0.4
|
||||||
|
ItemSep 0
|
||||||
|
TopSep 0.7
|
||||||
|
BottomSep 0.7
|
||||||
|
ParSep 0.5
|
||||||
|
Align Block
|
||||||
|
AlignPossible Block, Left
|
||||||
|
LabelType Bibliography
|
||||||
|
LabelString References
|
||||||
|
LabelBottomSep 0.7
|
||||||
|
|
||||||
|
# label font definition
|
||||||
|
LabelFont
|
||||||
|
Series Bold
|
||||||
|
EndFont
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
\newcommand{\lyxbibliography}{\thebibliography{References}%
|
||||||
|
\renewcommand{\bibitem}[3][!]{\@bibitem{##1}{##2}{##3}}}
|
||||||
|
EndPreamble
|
||||||
|
|
||||||
|
End
|
||||||
|
|
||||||
|
# Mathematics-like definitions:
|
||||||
|
|
||||||
|
Style Case
|
||||||
|
Margin First_Dynamic
|
||||||
|
LatexType Environment
|
||||||
|
LatexName case
|
||||||
|
NextNoIndent 0
|
||||||
|
ParIndent MM
|
||||||
|
LabelSep xx
|
||||||
|
ItemSep 0
|
||||||
|
TopSep 0.5
|
||||||
|
BottomSep 0.5
|
||||||
|
ParSep 0
|
||||||
|
Align Block
|
||||||
|
AlignPossible Block, Left
|
||||||
|
LabelType Static
|
||||||
|
LabelString Case #.
|
||||||
|
|
||||||
|
# font & label font definition
|
||||||
|
|
||||||
|
LabelFont
|
||||||
|
Shape Italic
|
||||||
|
EndFont
|
||||||
|
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Claim
|
||||||
|
CopyStyle Case
|
||||||
|
LatexName claim
|
||||||
|
LabelString "Claim. "
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Conjecture
|
||||||
|
CopyStyle Case
|
||||||
|
LatexName conjecture
|
||||||
|
LabelString "Conjecture #. "
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Corollary
|
||||||
|
CopyStyle Case
|
||||||
|
LatexName corollary
|
||||||
|
LabelString "Corollary #. "
|
||||||
|
|
||||||
|
# font & label font definition
|
||||||
|
Font
|
||||||
|
Shape Italic
|
||||||
|
EndFont
|
||||||
|
|
||||||
|
LabelFont
|
||||||
|
Shape Up
|
||||||
|
Series Bold
|
||||||
|
EndFont
|
||||||
|
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Definition
|
||||||
|
CopyStyle Corollary
|
||||||
|
LatexName definition
|
||||||
|
LabelString "Definition #. "
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Example
|
||||||
|
CopyStyle Case
|
||||||
|
LatexName example
|
||||||
|
LabelString "Example #. "
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Exercise
|
||||||
|
CopyStyle Case
|
||||||
|
LatexName exercise
|
||||||
|
LabelString "Exercise #. "
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Lemma
|
||||||
|
CopyStyle Corollary
|
||||||
|
LatexName lemma
|
||||||
|
LabelString "Lemma #. "
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Note
|
||||||
|
CopyStyle Case
|
||||||
|
LatexName note
|
||||||
|
LabelString "Note #. "
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Problem
|
||||||
|
CopyStyle Exercise
|
||||||
|
LatexName problem
|
||||||
|
LabelString "Problem #. "
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Proof
|
||||||
|
CopyStyle Claim
|
||||||
|
LatexName proof
|
||||||
|
LabelString "Proof. "
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Property
|
||||||
|
CopyStyle Case
|
||||||
|
LatexName property
|
||||||
|
LabelString "Property #. "
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Proposition
|
||||||
|
CopyStyle Corollary
|
||||||
|
LatexName proposition
|
||||||
|
LabelString "Proposition #. "
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Question
|
||||||
|
CopyStyle Case
|
||||||
|
LatexName question
|
||||||
|
LabelString "Question #. "
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Remark
|
||||||
|
CopyStyle Case
|
||||||
|
LatexName remark
|
||||||
|
LabelString "Remark #. "
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Solution
|
||||||
|
CopyStyle Case
|
||||||
|
LatexName solution
|
||||||
|
LabelString "Solution #. "
|
||||||
|
End
|
||||||
|
|
||||||
|
Style Theorem
|
||||||
|
CopyStyle Corollary
|
||||||
|
LatexName theorem
|
||||||
|
LabelString "Theorem #. "
|
||||||
|
End
|
||||||
|
|
||||||
|
#Finally a few older definitions for compatibility
|
||||||
|
Input obsolete.inc
|
||||||
@ -419,6 +419,10 @@
|
|||||||
# sent in standard input (stdin). There is no default command
|
# sent in standard input (stdin). There is no default command
|
||||||
# specified. Example:
|
# specified. Example:
|
||||||
#\custom_export_command "kghostview $$FName"
|
#\custom_export_command "kghostview $$FName"
|
||||||
|
#
|
||||||
|
# A more elaborate example to create pdf files with ps2pdf would be:
|
||||||
|
#\custom_export_command "ps2pdf '$$FName' `basename '$$FName' .ps_tmp`.pdf"
|
||||||
|
|
||||||
|
|
||||||
# This is the default for the type of contents to be sent to the export
|
# This is the default for the type of contents to be sent to the export
|
||||||
# command: possible values are lyx, dvi, tex, ps and ascii.
|
# command: possible values are lyx, dvi, tex, ps and ascii.
|
||||||
@ -574,9 +578,9 @@
|
|||||||
# does not work with all dictionaries, so this is disabled by default.
|
# does not work with all dictionaries, so this is disabled by default.
|
||||||
#\use_input_encoding true
|
#\use_input_encoding true
|
||||||
|
|
||||||
# DEFAULT FORMAT STRING FOR THE date-insert COMMAND
|
# Default format string for the date-insert command
|
||||||
#
|
#
|
||||||
# This accepts the normal strftime formats have a look at man strftime
|
# This accepts the normal strftime formats; see man strftime for full
|
||||||
# for nowing exactly what the formats are for and how to use them.
|
# details of the format.
|
||||||
#
|
#
|
||||||
#\date_insert_format "%A, %e. %B %Y"
|
#\date_insert_format "%A, %e. %B %Y"
|
||||||
|
|||||||
4
po/fr.po
4
po/fr.po
@ -3900,9 +3900,7 @@ msgstr "FIM|Nn#n#N"
|
|||||||
msgid ""
|
msgid ""
|
||||||
"Export%t|as LaTeX...%x40|as DVI...%x41|as PostScript...%x42|as Ascii "
|
"Export%t|as LaTeX...%x40|as DVI...%x41|as PostScript...%x42|as Ascii "
|
||||||
"Text...%x43|as HTML...%x44|Custom...%x45"
|
"Text...%x43|as HTML...%x44|Custom...%x45"
|
||||||
msgstr ""
|
msgstr "Exporter%t|en LaTeX...%x40|en DVI...%x41|en PostScript...%x42|en texte Ascii ...%x43|en HTML...%x44|Personnalisé...%x45"
|
||||||
"Exporter%t|en LaTeX...%x40|en DVI...%x41|en PostScript...%x42|en texte Ascii "
|
|
||||||
"...%x43|Personnalisé...%x44"
|
|
||||||
|
|
||||||
#: src/menus.C:494
|
#: src/menus.C:494
|
||||||
msgid ""
|
msgid ""
|
||||||
|
|||||||
22
src/LaTeX.C
22
src/LaTeX.C
@ -449,6 +449,8 @@ bool LaTeX::runBibTeX(string const & f, DepTable & dep)
|
|||||||
|
|
||||||
int LaTeX::scanLogFile(TeXErrors & terr)
|
int LaTeX::scanLogFile(TeXErrors & terr)
|
||||||
{
|
{
|
||||||
|
int last_line = -1;
|
||||||
|
int line_count = 1;
|
||||||
int retval = NO_ERRORS;
|
int retval = NO_ERRORS;
|
||||||
string tmp = ChangeExtension(file, ".log", true);
|
string tmp = ChangeExtension(file, ".log", true);
|
||||||
lyxerr[Debug::LATEX] << "Log file: " << tmp << endl;
|
lyxerr[Debug::LATEX] << "Log file: " << tmp << endl;
|
||||||
@ -499,7 +501,13 @@ int LaTeX::scanLogFile(TeXErrors & terr)
|
|||||||
retval |= LATEX_ERROR;
|
retval |= LATEX_ERROR;
|
||||||
// get the next line
|
// get the next line
|
||||||
string tmp;
|
string tmp;
|
||||||
getline(ifs, tmp);
|
int count = 0;
|
||||||
|
do {
|
||||||
|
if (!getline(ifs, tmp))
|
||||||
|
break;
|
||||||
|
if (++count > 10)
|
||||||
|
break;
|
||||||
|
} while (!prefixIs(tmp, "l."));
|
||||||
if (prefixIs(tmp, "l.")) {
|
if (prefixIs(tmp, "l.")) {
|
||||||
// we have a latex error
|
// we have a latex error
|
||||||
retval |= TEX_ERROR;
|
retval |= TEX_ERROR;
|
||||||
@ -522,8 +530,16 @@ int LaTeX::scanLogFile(TeXErrors & terr)
|
|||||||
<< "line: " << line << '\n'
|
<< "line: " << line << '\n'
|
||||||
<< "Desc: " << desc << '\n'
|
<< "Desc: " << desc << '\n'
|
||||||
<< "Text: " << errstr << endl;
|
<< "Text: " << errstr << endl;
|
||||||
terr.insertError(line, desc, errstr);
|
if (line == last_line)
|
||||||
++num_errors;
|
++line_count;
|
||||||
|
else {
|
||||||
|
line_count = 1;
|
||||||
|
last_line = line;
|
||||||
|
}
|
||||||
|
if (line_count <= 5) {
|
||||||
|
terr.insertError(line, desc, errstr);
|
||||||
|
++num_errors;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// information messages, TeX warnings and other
|
// information messages, TeX warnings and other
|
||||||
|
|||||||
@ -306,7 +306,7 @@ void LyXView::updateLayoutChoice()
|
|||||||
// we need to do this.
|
// we need to do this.
|
||||||
toolbar->combox->Redraw();
|
toolbar->combox->Redraw();
|
||||||
|
|
||||||
char layout = bufferview->text->cursor.par->GetLayout();
|
LyXTextClass::size_type layout = bufferview->text->cursor.par->GetLayout();
|
||||||
|
|
||||||
if (layout != current_layout){
|
if (layout != current_layout){
|
||||||
toolbar->combox->select(layout + 1);
|
toolbar->combox->select(layout + 1);
|
||||||
|
|||||||
@ -82,7 +82,7 @@ public:
|
|||||||
/** set layout over selection and make a total rebreak of
|
/** set layout over selection and make a total rebreak of
|
||||||
those paragraphs
|
those paragraphs
|
||||||
*/
|
*/
|
||||||
void SetLayout(char layout);
|
void SetLayout(LyXTextClass::size_type layout);
|
||||||
|
|
||||||
/// used in setlayout
|
/// used in setlayout
|
||||||
void MakeFontEntriesLayoutSpecific(LyXParagraph * par);
|
void MakeFontEntriesLayoutSpecific(LyXParagraph * par);
|
||||||
@ -492,7 +492,7 @@ private:
|
|||||||
Asger has learned that this should be a buffer-property instead
|
Asger has learned that this should be a buffer-property instead
|
||||||
Lgb has learned that 'char' is a lousy type for non-characters
|
Lgb has learned that 'char' is a lousy type for non-characters
|
||||||
*/
|
*/
|
||||||
char copylayouttype;
|
LyXTextClass::size_type copylayouttype;
|
||||||
|
|
||||||
/// the currentrow is needed to access rows faster*/
|
/// the currentrow is needed to access rows faster*/
|
||||||
mutable Row * currentrow; // pointer to the current row
|
mutable Row * currentrow; // pointer to the current row
|
||||||
|
|||||||
@ -459,7 +459,7 @@ void LyXText::MakeFontEntriesLayoutSpecific(LyXParagraph * par)
|
|||||||
|
|
||||||
|
|
||||||
// set layout over selection and make a total rebreak of those paragraphs
|
// set layout over selection and make a total rebreak of those paragraphs
|
||||||
void LyXText::SetLayout(char layout)
|
void LyXText::SetLayout(LyXTextClass::size_type layout)
|
||||||
{
|
{
|
||||||
LyXCursor tmpcursor;
|
LyXCursor tmpcursor;
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user