commit 5c545573507bbf55f78c294188537c6aff959bc0 Author: Jean-Marc Lasgouttes <lasgout...@lyx.org> Date: Thu Aug 31 12:03:54 2017 +0200
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. lib/layouts/AEA.layout | 4 +- lib/layouts/IEEEtran-CompSoc.layout | 2 +- lib/layouts/IEEEtran-TransMag.layout | 2 +- lib/layouts/IEEEtran.layout | 2 +- lib/layouts/InStar.module | 2 +- lib/layouts/RJournal.layout | 2 +- lib/layouts/a0poster.layout | 2 +- lib/layouts/aa.layout | 2 +- lib/layouts/aapaper.inc | 2 +- lib/layouts/aapaper.layout | 2 +- lib/layouts/aastex.layout | 2 +- lib/layouts/aastex6.layout | 2 +- lib/layouts/achemso.layout | 2 +- lib/layouts/acm-sigs-alt.layout | 2 +- lib/layouts/acm-sigs.inc | 2 +- lib/layouts/acm-sigs.layout | 2 +- lib/layouts/acmart.layout | 64 ++++++++++---------- lib/layouts/acmsiggraph-0-92.layout | 2 +- lib/layouts/acmsiggraph.layout | 2 +- lib/layouts/agu-dtd.layout | 2 +- lib/layouts/agu_stdclass.inc | 2 +- lib/layouts/agu_stdcounters.inc | 2 +- lib/layouts/agu_stdlists.inc | 2 +- lib/layouts/agu_stdsections.inc | 2 +- lib/layouts/agu_stdtitle.inc | 2 +- lib/layouts/agums.layout | 2 +- lib/layouts/aguplus.inc | 2 +- lib/layouts/agutex.layout | 2 +- lib/layouts/algorithm2e.module | 2 +- lib/layouts/amsart.layout | 2 +- lib/layouts/amsbook.layout | 2 +- lib/layouts/amsdefs.inc | 2 +- lib/layouts/apa.layout | 2 +- lib/layouts/apa6.layout | 2 +- lib/layouts/arab-article.layout | 2 +- lib/layouts/article-beamer.layout | 2 +- lib/layouts/article.layout | 2 +- lib/layouts/beamer.layout | 2 +- lib/layouts/beamerposter.layout | 2 +- lib/layouts/bicaption.module | 2 +- lib/layouts/book.layout | 2 +- lib/layouts/braille.module | 2 +- lib/layouts/broadway.layout | 2 +- lib/layouts/changebars.module | 2 +- lib/layouts/chess.layout | 2 +- lib/layouts/cl2emult.layout | 2 +- lib/layouts/ctex-article.layout | 2 +- lib/layouts/ctex-book.layout | 2 +- lib/layouts/ctex-report.layout | 2 +- lib/layouts/customHeadersFooters.module | 2 +- lib/layouts/db_lyxmacros.inc | 2 +- lib/layouts/db_stdcharstyles.inc | 2 +- lib/layouts/db_stdclass.inc | 2 +- lib/layouts/db_stdcounters.inc | 2 +- lib/layouts/db_stdlayouts.inc | 2 +- lib/layouts/db_stdlists.inc | 2 +- lib/layouts/db_stdsections.inc | 2 +- lib/layouts/db_stdstarsections.inc | 2 +- lib/layouts/db_stdstruct.inc | 2 +- lib/layouts/db_stdtitle.inc | 2 +- lib/layouts/dinbrief.layout | 2 +- lib/layouts/docbook-book.layout | 2 +- lib/layouts/docbook-chapter.layout | 2 +- lib/layouts/docbook-section.layout | 2 +- lib/layouts/docbook.layout | 2 +- lib/layouts/doublecol-new.layout | 2 +- lib/layouts/dtk.layout | 2 +- lib/layouts/ectaart.layout | 2 +- lib/layouts/egs.layout | 2 +- lib/layouts/elsart.layout | 2 +- lib/layouts/elsarticle.layout | 2 +- lib/layouts/endnotes.module | 2 +- lib/layouts/entcs.layout | 2 +- lib/layouts/enumitem.module | 2 +- lib/layouts/eqs-within-sections.module | 2 +- lib/layouts/europasscv.layout | 2 +- lib/layouts/europecv.layout | 2 +- lib/layouts/extarticle.layout | 2 +- lib/layouts/extbook.layout | 2 +- lib/layouts/extletter.layout | 2 +- lib/layouts/extreport.layout | 2 +- lib/layouts/figs-within-sections.module | 2 +- lib/layouts/fix-cm.module | 2 +- lib/layouts/fixltx2e.module | 2 +- lib/layouts/fixme.module | 2 +- lib/layouts/foils.layout | 2 +- lib/layouts/foottoend.module | 2 +- lib/layouts/frletter.layout | 2 +- lib/layouts/g-brief.layout | 2 +- lib/layouts/g-brief2.layout | 2 +- lib/layouts/graphicboxes.module | 2 +- lib/layouts/hanging.module | 2 +- lib/layouts/heb-article.layout | 2 +- lib/layouts/heb-letter.layout | 2 +- lib/layouts/hollywood.layout | 2 +- lib/layouts/hpstatement.module | 2 +- lib/layouts/ijmpc.layout | 2 +- lib/layouts/ijmpd.layout | 2 +- lib/layouts/initials.module | 2 +- lib/layouts/iopart.layout | 2 +- lib/layouts/isprs.layout | 2 +- lib/layouts/iucr.layout | 2 +- lib/layouts/jarticle.layout | 2 +- lib/layouts/jasatex.layout | 2 +- lib/layouts/jbook.layout | 2 +- lib/layouts/jgrga.layout | 2 +- lib/layouts/jreport.layout | 2 +- lib/layouts/jsarticle.layout | 2 +- lib/layouts/jsbook.layout | 2 +- lib/layouts/jss.layout | 2 +- lib/layouts/kluwer.layout | 2 +- lib/layouts/knitr.module | 2 +- lib/layouts/latex8.layout | 2 +- lib/layouts/letter.layout | 2 +- lib/layouts/lettre.layout | 2 +- lib/layouts/lilypond.module | 2 +- lib/layouts/linguistics.module | 2 +- lib/layouts/litinsets.inc | 2 +- lib/layouts/llncs.layout | 2 +- lib/layouts/logicalmkup.module | 2 +- lib/layouts/ltugboat.layout | 2 +- lib/layouts/lyxmacros.inc | 2 +- lib/layouts/memoir.layout | 2 +- lib/layouts/minimalistic.module | 2 +- lib/layouts/moderncv.layout | 2 +- lib/layouts/multicol.module | 2 +- lib/layouts/mwart.layout | 2 +- lib/layouts/mwbk.layout | 2 +- lib/layouts/mwrep.layout | 2 +- lib/layouts/natbibapa.module | 2 +- lib/layouts/noweb.module | 2 +- lib/layouts/numarticle.inc | 2 +- lib/layouts/numreport.inc | 2 +- lib/layouts/numrevtex.inc | 2 +- lib/layouts/paper.layout | 2 +- lib/layouts/paralist.module | 2 +- lib/layouts/pdfcomment.module | 2 +- lib/layouts/pdfform.module | 2 +- lib/layouts/powerdot.layout | 4 +- lib/layouts/recipebook.layout | 2 +- lib/layouts/report.layout | 2 +- lib/layouts/revtex.layout | 2 +- lib/layouts/revtex4-1.layout | 2 +- lib/layouts/revtex4.layout | 2 +- lib/layouts/rsphrase.module | 2 +- lib/layouts/sciposter.layout | 2 +- lib/layouts/scrartcl.layout | 2 +- lib/layouts/scrarticle-beamer.layout | 2 +- lib/layouts/scrbook.layout | 2 +- lib/layouts/scrclass.inc | 2 +- lib/layouts/scrlettr.layout | 2 +- lib/layouts/scrlttr2.layout | 2 +- lib/layouts/scrreprt.layout | 2 +- lib/layouts/sectionbox.module | 2 +- lib/layouts/seminar.layout | 2 +- lib/layouts/shapepar.module | 2 +- lib/layouts/siamltex.layout | 2 +- lib/layouts/sigplanconf.layout | 2 +- lib/layouts/simplecv.layout | 2 +- lib/layouts/singlecol-new.layout | 2 +- lib/layouts/singlecol.layout | 2 +- lib/layouts/slides.layout | 2 +- lib/layouts/spie.layout | 2 +- lib/layouts/stdcharstyles.inc | 2 +- lib/layouts/stdciteformats.inc | 2 +- lib/layouts/stdclass.inc | 2 +- lib/layouts/stdcounters.inc | 2 +- lib/layouts/stdcustom.inc | 2 +- lib/layouts/stdfloatnames.inc | 2 +- lib/layouts/stdfloats.inc | 2 +- lib/layouts/stdinsets.inc | 2 +- lib/layouts/stdlayouts.inc | 2 +- lib/layouts/stdletter.inc | 2 +- lib/layouts/stdlists.inc | 2 +- lib/layouts/stdlyxlist.inc | 2 +- lib/layouts/stdrefprefix.inc | 2 +- lib/layouts/stdsections.inc | 2 +- lib/layouts/stdstarsections.inc | 2 +- lib/layouts/stdstruct.inc | 2 +- lib/layouts/stdtitle.inc | 2 +- lib/layouts/subequations.module | 2 +- lib/layouts/svcommon.inc | 2 +- lib/layouts/svglobal.layout | 2 +- lib/layouts/svglobal3.layout | 2 +- lib/layouts/svjog.layout | 2 +- lib/layouts/svmono.layout | 2 +- lib/layouts/svmult.layout | 4 +- lib/layouts/svprobth.layout | 2 +- lib/layouts/sweave.module | 2 +- lib/layouts/tabs-within-sections.module | 2 +- lib/layouts/tarticle.layout | 2 +- lib/layouts/tbook.layout | 2 +- lib/layouts/tcolorbox.module | 2 +- lib/layouts/theorems-ams-bytype.inc | 2 +- lib/layouts/theorems-ams-bytype.module | 2 +- lib/layouts/theorems-ams-chap-bytype.inc | 2 +- lib/layouts/theorems-ams-chap-bytype.module | 2 +- lib/layouts/theorems-ams-extended-bytype.module | 2 +- .../theorems-ams-extended-chap-bytype.module | 2 +- lib/layouts/theorems-ams-extended.module | 2 +- lib/layouts/theorems-ams.inc | 2 +- lib/layouts/theorems-ams.module | 2 +- lib/layouts/theorems-bytype.inc | 2 +- lib/layouts/theorems-bytype.module | 2 +- lib/layouts/theorems-case.inc | 2 +- lib/layouts/theorems-chap-bytype.module | 2 +- lib/layouts/theorems-chap.module | 2 +- lib/layouts/theorems-named.module | 2 +- lib/layouts/theorems-order.inc | 2 +- lib/layouts/theorems-proof-std.inc | 2 +- lib/layouts/theorems-proof.inc | 2 +- lib/layouts/theorems-refprefix.inc | 2 +- lib/layouts/theorems-sec-bytype.module | 2 +- lib/layouts/theorems-sec.module | 2 +- lib/layouts/theorems-starred-equivalents.inc | 2 +- lib/layouts/theorems-starred.inc | 2 +- lib/layouts/theorems-starred.module | 2 +- lib/layouts/theorems-std.module | 2 +- lib/layouts/theorems-without-preamble.inc | 2 +- lib/layouts/theorems.inc | 2 +- lib/layouts/todonotes.module | 2 +- lib/layouts/treport.layout | 2 +- lib/layouts/tufte-book.layout | 2 +- lib/layouts/tufte-handout.layout | 2 +- lib/layouts/varwidth.module | 2 +- lib/scripts/layout2layout.py | 21 ++++++- src/Layout.cpp | 4 - src/TextClass.cpp | 2 +- 228 files changed, 280 insertions(+), 265 deletions(-)