Honor trailing spaces in LabelString and friends

Remove the trimming operation on LabelString, LabelStringAppendix,
EndLabelString and LabelCounter. This trimming meant that quotes
strings were not preserved, which is wrong.

To preserve layouts, the Layout format has been updated to 64, so that
layout2layout can remove extra spaces on existing strings, which
ensures that behavior is unchanged for old layouts (courtesy of rgheck).

It is now possible to re-add spaces in label strings where it makes
sense.

Fixes bug #10723.

(cherry picked from commit 5c54557350)
This commit is contained in:
Jean-Marc Lasgouttes 2017-08-31 12:03:54 +02:00
parent 4485250e32
commit b92ceba9a1
228 changed files with 280 additions and 265 deletions

View File

@ -4,7 +4,7 @@
# Authors : Koji Yokota <yokota@res.otaru-uc.ac.jp>
# Uwe Stöhr <uwestoehr@web.de>
Format 63
Format 64
Input stdclass.inc
Input theorems-ams.module
Input theorems-bytype.module

View File

@ -6,7 +6,7 @@
# IEEtran Computer Society textclass definition file.
Format 63
Format 64
Input IEEEtran.layout

View File

@ -6,7 +6,7 @@
# IEEtran Magnetics textclass definition file.
Format 63
Format 64
Input IEEEtran.layout

View File

@ -9,7 +9,7 @@
# IEEtran textclass definition file.
Format 63
Format 64
Sides 1
SecNumDepth 3

View File

@ -11,7 +11,7 @@
#DescriptionEnd
#Author: Richard Heck <rgheck@lyx.org>
Format 63
Format 64
Style "In Preamble"
CopyStyle Standard

View File

@ -4,7 +4,7 @@
# Author: Yihui Xie
# Modified by: Scott Kostyshak
Format 63
Format 64
Input stdclass.inc

View File

@ -3,7 +3,7 @@
# \DeclareCategory{Posters}
# Wrapper layout for the a0poster poster class
Format 63
Format 64
# Authors: Günter Milde, Jürgen Spitzmüller

View File

@ -18,7 +18,7 @@
# 2013-05-26 Updated for aa.cls version 8.2
Format 63
Format 64
Columns 2
Sides 2
SecNumDepth 3

View File

@ -5,7 +5,7 @@
# Author: Peter Sütterlin <pit@uni-sw.gwdg.de>
Format 63
Format 64
Style Subtitle
Margin Static
LatexType Command

View File

@ -15,7 +15,7 @@
# and reconfigure LyX (after running texhash, of course).
Format 63
Format 64
Columns 2
Sides 2
SecNumDepth 3

View File

@ -42,7 +42,7 @@
# The new "aastex6.layout" depends on aastex6.cls but inputs this
# file for the definitions (cf. LyX ticket #10027)
Format 63
Format 64
Columns 1
Sides 1
#SecNumDepth 3

View File

@ -46,7 +46,7 @@
# - aastex6.cls loads hyperref (with pre-set options) and url
# -> option clash if "Use Hyerref" is selected in Document>Settings
Format 63
Format 64
Input aastex.layout

View File

@ -4,7 +4,7 @@
# textclass definition file for achemso 3.8 and 3.9
# Author: Uwe Stöhr (uwestoehr@web.de)
Format 63
Format 64
Columns 1
Sides 1

View File

@ -9,6 +9,6 @@
#
# Author: Gioele Barabucci
Format 63
Format 64
Input acm-sigs.inc

View File

@ -2,7 +2,7 @@
#
# Author: Gioele Barabucci
Format 63
Format 64
Input stdclass.inc
Columns 2

View File

@ -9,6 +9,6 @@
#
# Author: Gioele Barabucci
Format 63
Format 64
Input acm-sigs.inc

View File

@ -7,7 +7,7 @@
# Author : John Perry <john.perry@usm.edu>
# Guillaume Munch-Maccagnoni <gm@lyx.org>
Format 63
Format 64
Provides amscls 1
Provides amsmath 1

View File

@ -19,7 +19,7 @@
# "TOG data URL", and "TOG code URL". The corresponding
# LaTeX commands are no longer supported.
Format 63
Format 64
Columns 1
Sides 1

View File

@ -11,7 +11,7 @@
# ACM style files can be obtained at
# http://www.acm.org/sigs/pubs/proceed/template.html
Format 63
Format 64
Columns 1
Sides 1

View File

@ -6,7 +6,7 @@
# Martin Vermeer <martin.vermeer@hut.fi>
Format 63
Format 64
Input agu_stdclass.inc
# Exclude higher, or equal, sections:

View File

@ -6,7 +6,7 @@
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
Format 63
Format 64
OutputType docbook
Columns 1

View File

@ -4,7 +4,7 @@
# This include file contains all the counters that are defined as standard
# in AGU-Article LyX layouts.
Format 63
Format 64
Counter sect1
Within section
End

View File

@ -6,7 +6,7 @@
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
Format 63
Format 64
Input stdlists.inc

View File

@ -6,7 +6,7 @@
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
Format 63
Format 64
Input stdsections.inc
Style Part

View File

@ -6,7 +6,7 @@
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
Format 63
Format 64
Input stdtitle.inc

View File

@ -5,7 +5,7 @@
# Author: Martin Vermeer <martin.vermeer@hut.fi>
Format 63
Format 64
Input aguplus.inc
ClassOptions

View File

@ -6,7 +6,7 @@
# ftp://ftp.agu.org/journals/latex/journals
Format 63
Format 64
Input stdclass.inc
SecNumDepth 4

View File

@ -4,7 +4,7 @@
# AGUTeX textclass definition file.
# Author: Uwe Stöhr (uwestoehr@web.de)
Format 63
Format 64
Columns 1
Sides 1

View File

@ -7,7 +7,7 @@
#
#Author: Jürgen Spitzmüller
Format 63
Format 64
Requires algorithm2e

View File

@ -11,7 +11,7 @@
# Modularized Jan '08 by Richard Heck <rgheck@brown.edu>
# Moved "number within sections" to modules Aug '09 (Paul Rubin <rubin@msu.edu>)
Format 63
Format 64
Columns 1
Sides 2

View File

@ -12,7 +12,7 @@
# Moved "number within sections" to modules Aug '09 (Paul Rubin <rubin@msu.edu>)
Format 63
Format 64
Columns 1
Sides 2

View File

@ -5,7 +5,7 @@
# Modularized Jan '08 by Richard Heck <rgheck@brown.edu>
# Including the maths stuff
Format 63
Format 64
# By default AMS articles & books use leqno option (as SIAM journals).
Provides leqno 1

View File

@ -3,7 +3,7 @@
# \DeclareCategory{Articles}
# Author: Randy Gobbel <gobbel@andrew.cmu.edu>
Format 63
Format 64
Columns 1
Sides 1
PageStyle Headers

View File

@ -3,7 +3,7 @@
# \DeclareCategory{Articles}
# Author: Jacob Bishop <bishop.jacob@gmail.com> based on the apa
# layout written by Randy Gobbel.
Format 63
Format 64
Columns 1
Sides 1
PageStyle Headers

View File

@ -4,5 +4,5 @@
# Arabic article textclass definition file.
# Author: Dekel Tsur <dekel@math.tau.ac.il>
Format 63
Format 64
Input article

View File

@ -3,7 +3,7 @@
# \DeclareCategory{Articles}
# Author: Jürgen Spitzmüller <spitz@lyx.org>
Format 63
Format 64
# Includes
Input article.layout

View File

@ -6,7 +6,7 @@
# Transposed by Pascal André <andre@via.ecp.fr>
# Heavily modifed and enhanced by serveral developers.
Format 63
Format 64
Input stdclass.inc
SecNumDepth 3

View File

@ -6,7 +6,7 @@
# Richard Heck <rgheck@lyx.org>, Martin Vermeer <martin.vermeer@hut.fi> and probably others.
Format 63
Format 64
#
# GLOBAL SETTINGS

View File

@ -7,7 +7,7 @@
#
# Input general definitions
Format 63
Format 64
Input beamer.layout

View File

@ -5,7 +5,7 @@
#DescriptionEnd
#Author: Uwe Stöhr <uwestoehr@web.de>
Format 63
Format 64
Style "Caption setup"
LatexType command

View File

@ -7,7 +7,7 @@
# Heavily modifed and enhanced by serveral developers.
Format 63
Format 64
Input stdclass.inc
Input numreport.inc

View File

@ -5,7 +5,7 @@
#DescriptionEnd
# Author: Uwe Stöhr <uwestoehr@web.de>
Format 63
Format 64
AddToPreamble
\usepackage{braille}

View File

@ -4,7 +4,7 @@
# For theater plays
Format 63
Format 64
Columns 1
Sides 1
SecNumDepth 2

View File

@ -14,7 +14,7 @@
# tracking is turned off in the document.
#
Format 63
Format 64
AddToPreamble
\usepackage{changebar}

View File

@ -17,7 +17,7 @@
# \vspace*{-0.5in})
#
Format 63
Format 64
Requires chess

View File

@ -4,7 +4,7 @@
# Springer's cl2emult textclass definition file.
# Author : André Poenitz
Format 63
Format 64
Columns 1
Sides 1
SecNumDepth 2

View File

@ -2,7 +2,7 @@
# \DeclareLaTeXClass[ctexart,savesym.sty,xeCJK.sty]{Chinese Article (CTeX)}
# \DeclareCategory{Articles}
Format 63
Format 64
# Read the definitions from article.layout
Input article.layout

View File

@ -2,7 +2,7 @@
# \DeclareLaTeXClass[ctexbook,savesym.sty,xeCJK.sty]{Chinese Book (CTeX)}
# \DeclareCategory{Books}
Format 63
Format 64
# Read the definitions from book.layout
Input book.layout

View File

@ -2,7 +2,7 @@
# \DeclareLaTeXClass[ctexrep,savesym.sty,xeCJK.sty]{Chinese Report (CTeX)}
# \DeclareCategory{Reports}
Format 63
Format 64
# Read the definitions from report.layout
Input report.layout

View File

@ -6,7 +6,7 @@
#DescriptionEnd
#Author: Uwe Stöhr
Format 63
Format 64
Style "Left Header"
Category Header/Footer

View File

@ -5,7 +5,7 @@
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
Format 63
Format 64
Input lyxmacros.inc
Style Code

View File

@ -2,7 +2,7 @@
# Author : José Abílio Oliveira Matos <jamatos@lyx.org>
# Character Styles definition
Format 63
Format 64
InsetLayout Flex:Filename
LyXType element
LabelString Filename

View File

@ -5,7 +5,7 @@
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
Format 63
Format 64
OutputType docbook
Columns 1

View File

@ -4,7 +4,7 @@
# This include file contains all the counters that are defined as standard
# in Docbook LyX layouts.
Format 63
Format 64
Counter sect1
Within chapter
End

View File

@ -5,7 +5,7 @@
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
Format 63
Format 64
Input stdlayouts.inc
Style Literal

View File

@ -5,7 +5,7 @@
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
Format 63
Format 64
Input stdlists.inc

View File

@ -6,7 +6,7 @@
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
Format 63
Format 64
Input stdsections.inc
Style Part

View File

@ -9,7 +9,7 @@
# modifying the style of the regular sectioning layouts.
Format 63
Format 64
Style Part*
CopyStyle Part
Margin Static

View File

@ -5,7 +5,7 @@
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
Format 63
Format 64
Input stdstruct.inc
Style Abstract

View File

@ -6,7 +6,7 @@
# It is desirable, as far as possible, to have the same look and feel for
# related layouts in latex and docbook.
Format 63
Format 64
Input stdtitle.inc

View File

@ -14,7 +14,7 @@
# Modified by: Juergen Spitzmueller <spitz@lyx.org>
# use English strings, localization is done by gettext!
Format 63
Format 64
Input letter.layout

View File

@ -5,7 +5,7 @@
# Author : Jose' Matos <jamatos@lyx.org>
# hacked for books: Luc Abom <luc@abom.com>
Format 63
Format 64
Input report
Input db_stdclass.inc

View File

@ -4,7 +4,7 @@
# DocBook textclass definition file.
# Author : Jose' Matos <jamatos@lyx.org>
Format 63
Format 64
Input db_stdclass.inc
Style Title

View File

@ -4,7 +4,7 @@
# DocBook textclass definition file.
# Author : Jose' Matos <jamatos@lyx.org>
Format 63
Format 64
Input db_stdclass.inc
Style Title

View File

@ -4,7 +4,7 @@
# DocBook textclass definition file.
# Author : Jose' Matos <jamatos@lyx.org>
Format 63
Format 64
Input db_stdclass.inc
# Exclude higher, or equal, sections:

View File

@ -6,5 +6,5 @@
# TeX templates are found at http://www.inderscience.com/mapper.php?id=64
#
# Read the definitions from article.layout
Format 63
Format 64
Input article.layout

View File

@ -7,7 +7,7 @@
# Author : Herbert Voss <voss@lyx.org> 2001/08/13
Format 63
Format 64
Columns 1
Sides 2
SecNumDepth -1 # no counting

View File

@ -3,7 +3,7 @@
# \DeclareCategory{Articles}
# Author : Koji Yokota <yok...@res.otaru-uc.ac.jp>
Format 63
Format 64
Input article.layout
TitleLatexType Environment

View File

@ -9,7 +9,7 @@
# Converted article -> egs Martin Vermeer
Format 63
Format 64
Columns 2
Sides 1
PageStyle Plain

View File

@ -23,7 +23,7 @@
# numbered sections, as does the class file.
Format 63
Format 64
Columns 1
Sides 2
PageStyle headings

View File

@ -4,7 +4,7 @@
# elsarticle textclass definition file.
# Author: Uwe Stöhr (uwestoehr@web.de)
Format 63
Format 64
Columns 1
Sides 1

View File

@ -4,7 +4,7 @@
#\theendnotes in TeX-code where you want the endnotes to appear.
#DescriptionEnd
Format 63
Format 64
Counter endnotes
PrettyFormat "Endnote ##"

View File

@ -4,7 +4,7 @@
# Based on LyX article class; modified to support ENTCS class
# Reuben Thomas (rrt@sc3d.org) 27/5-2/6/01
Format 63
Format 64
Input article.layout
# only font size 11pt is really available

View File

@ -13,7 +13,7 @@
# both KOMA and non-KOMA document classes.
# 2011-01-12 bugfix: set elabeling label font to \normalfont.
Format 63
Format 64
# The package enumitem provides user control over the layout of the three
# basic list environments: enumerate, itemize and description. It supersedes

View File

@ -4,7 +4,7 @@
#the section number to the equation number, as in '(2.1)'.
#DescriptionEnd
Format 63
Format 64
Requires amsmath

View File

@ -35,7 +35,7 @@
# General textclass parameters
Format 63
Format 64
Columns 1
Sides 1

View File

@ -6,7 +6,7 @@
# General textclass parameters
Format 63
Format 64
Columns 1
Sides 1
SecNumDepth -1

View File

@ -3,7 +3,7 @@
# \DeclareCategory{Articles}
# Herbert Voss <voss@lyx.org>
Format 63
Format 64
Input article.layout
# change available fontsizes

View File

@ -4,7 +4,7 @@
# Extended book textclass definition file.
# Herbert Voss <voss@lyx.org>
Format 63
Format 64
Input book.layout
# change available fontsizes

View File

@ -4,7 +4,7 @@
# Extended article textclass definition file.
# Herbert Voss <voss@lyx.org>
Format 63
Format 64
Input letter.layout
# change available fontsizes

View File

@ -4,7 +4,7 @@
# Extented report textclass definition file.
# Herbert Voss <voss@lyx.org>
Format 63
Format 64
Input report.layout
# change available fontsizes

View File

@ -4,7 +4,7 @@
#the section number to the figure number, as in 'fig. 2.1'.
#DescriptionEnd
Format 63
Format 64
Requires amsmath

View File

@ -8,6 +8,6 @@
# Author : Patrick Atamaniuk <patrick-lyx@frobs.net>
Format 63
Format 64
Requires fix-cm

View File

@ -9,6 +9,6 @@
# Author : Georg Baum <baum@lyx.org>
Format 63
Format 64
Requires fixltx2e

View File

@ -12,7 +12,7 @@
# Authors: Mark Edgington <edgimar@gmail.com>
# Jürgen Spitzmüller <spitz@lyx.org>
Format 63
Format 64
OutlinerName fixme "Fixme"

View File

@ -7,7 +7,7 @@
# To do: Define class specific options.
Format 63
Format 64
Columns 1
Sides 1

View File

@ -4,7 +4,7 @@
#in TeX-code where you want the endnotes to appear.
#DescriptionEnd
Format 63
Format 64
Requires endnotes

View File

@ -4,7 +4,7 @@
# Layout file for the frletter class.
# Author : Liviu Andronic and Uwe Stöhr
Format 63
Format 64
# Read the definitions from letter.layout
Input letter.layout

View File

@ -4,7 +4,7 @@
# Letter textclass definition file.
# Author : Thomas Hartkens <thomas@hartkens.de>
Format 63
Format 64
Input stdinsets.inc
Input stdfloats.inc
Input stdcounters.inc

View File

@ -6,7 +6,7 @@
# Thomas Hartkens <thomas@hartkens.de>
# Input general definitions
Format 63
Format 64
Input stdfloats.inc
Input stdcounters.inc
Input stdinsets.inc

View File

@ -6,7 +6,7 @@
#Author: Jürgen Spitzmüller <spitz@lyx.org>
# Uwe Stöhr <uwestoehr@lyx.org>
Format 63
Format 64
InsetLayout Flex:Reflectbox
LyXType custom

View File

@ -11,7 +11,7 @@
#Copyright Peter R. Wilson.
#Released under the LaTeX Project Public License.
Format 63
Format 64
Style Hanging
LatexType Environment

View File

@ -5,7 +5,7 @@
# Author: Dekel Tsur <dekel@math.tau.ac.il>
# Few changes by Baruch Even <baruch.even@writeme.com>
Format 63
Format 64
Input article
Preamble

View File

@ -4,7 +4,7 @@
# Hebrew letter textclass definition file.
# Author: Dekel Tsur <dekel@math.tau.ac.il>
Format 63
Format 64
Input letter

View File

@ -16,7 +16,7 @@
# Based on course given by Lars Davidson
Format 63
Format 64
Columns 1
Sides 1
SecNumDepth 2

View File

@ -6,7 +6,7 @@
#DescriptionEnd
#Author: Uwe Stöhr <uwestoehr@web.de>
Format 63
Format 64
InsetLayout "Flex:H-P number"
LyxType custom

View File

@ -12,7 +12,7 @@
# Author: Uwe Stöhr (uwestoehr@web.de)
Format 63
Format 64
Sides 1
Columns 1

View File

@ -17,7 +17,7 @@
# Author: Uwe Stöhr (uwestoehr@web.de)
Format 63
Format 64
Sides 1
Columns 1

View File

@ -5,7 +5,7 @@
#DescriptionEnd
#Authors: Pavel Sanda and Uwe Stöhr
Format 63
Format 64
AddToPreamble
\@ifundefined{lettrine}{\usepackage{lettrine}}{}

View File

@ -4,7 +4,7 @@
# IOP article textclass definition file.
# Author: Uwe Stöhr (uwestoehr@web.de)
Format 63
Format 64
Columns 1
Sides 1

Some files were not shown because too many files have changed in this diff Show More