[LyX/master] DocBook: mark dates to disallow fonts inside.

Richard Kimberly Heck rikiheck at lyx.org
Sun Feb 14 16:13:00 UTC 2021


On 2/14/21 5:25 AM, Enrico Forestieri wrote:
> On Sun, Feb 14, 2021 at 06:05:12AM +0100, Thibaut Cuvelier wrote:
>> commit 5297862855f89ed44e62e7667e83b5fc1fd16e16
>> Author: Thibaut Cuvelier <tcuvelier at lyx.org>
>> Date:   Sun Feb 14 06:08:36 2021 +0100
>>
>>     DocBook: mark dates to disallow fonts inside.
> Shouldn't this be the kind of task to be performed by layout2layout.py?

Yes, probably. Thibaut, this should be reverted and replaced by a
layout2layout routine. Introduce a dummy format change if need be. Are
you familiar with how to do that? If not, I can do it.

Riki


>>     One more test passes.
>> ---
>>  development/autotests/invertedTests |    1 -
>>  lib/layouts/AEA.layout              |    2 ++
>>  lib/layouts/aa.layout               |    1 +
>>  lib/layouts/amsdefs.inc             |    1 +
>>  lib/layouts/copernicus.layout       |    5 +++++
>>  lib/layouts/dinbrief.layout         |    1 +
>>  lib/layouts/europasscv.layout       |    4 ++++
>>  lib/layouts/europecv.layout         |    4 ++++
>>  lib/layouts/frletter.layout         |    1 +
>>  lib/layouts/ijmpc.layout            |    2 ++
>>  lib/layouts/ijmpd.layout            |    2 ++
>>  lib/layouts/jasatex.layout          |    1 +
>>  lib/layouts/kluwer.layout           |    1 +
>>  lib/layouts/lettre.layout           |    1 +
>>  lib/layouts/moderncv.layout         |    1 +
>>  lib/layouts/scrclass.inc            |    1 +
>>  lib/layouts/scrlettr.layout         |    1 +
>>  lib/layouts/scrlttr2.layout         |    1 +
>>  lib/layouts/stdtitle.inc            |    1 +
>>  19 files changed, 31 insertions(+), 1 deletions(-)
>>
>> diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
>> index 8398440..268aac2 100644
>> --- a/development/autotests/invertedTests
>> +++ b/development/autotests/invertedTests
>> @@ -477,7 +477,6 @@ export/doc(|/de|/es|/fr|/ja|/ru)/Math_docbook5
>>  export/doc(|/de|/es|/fr|/ja|/ru)/UserGuide_docbook5
>>  # - Double inlines (code within code, personname within personname, emphasis within date, etc.).
>>  export/doc/(es|fr|ja)/Customization_docbook5
>> -export/examples/Articles/Chess/Game_2_docbook5
>>  # - Bicaption module would require some C++ implementation.
>>  export/examples(|/de|/fr|/ja)/Modules/Multilingual_Captions_docbook5
>>  # - European CV: hard to mix items and bibliographies.
>> diff --git a/lib/layouts/AEA.layout b/lib/layouts/AEA.layout
>> index 3493600..07c8b5d 100644
>> --- a/lib/layouts/AEA.layout
>> +++ b/lib/layouts/AEA.layout
>> @@ -73,6 +73,7 @@ Style Publication_Month
>>  	DocBookAttr           role='month'
>>  	DocBookTagType        paragraph
>>  	DocBookInInfo         maybe
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style Publication_Year
>> @@ -83,6 +84,7 @@ Style Publication_Year
>>  	DocBookAttr           role='year'
>>  	DocBookTagType        paragraph
>>  	DocBookInInfo         maybe
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style Publication_Volume
>> diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
>> index 1caeee1..55b38e4 100644
>> --- a/lib/layouts/aa.layout
>> +++ b/lib/layouts/aa.layout
>> @@ -262,6 +262,7 @@ Style Date
>>  	DocBookTag      date
>>  	DocBookTagType  paragraph
>>  	DocBookInInfo   always
>> +    DocBookNoFontInside true
>>  End
>>  
>>  
>> diff --git a/lib/layouts/amsdefs.inc b/lib/layouts/amsdefs.inc
>> index b1c9c87..0d9e6b0 100644
>> --- a/lib/layouts/amsdefs.inc
>> +++ b/lib/layouts/amsdefs.inc
>> @@ -103,6 +103,7 @@ Style Date
>>  	DocBookTag            date
>>  	DocBookTagType        paragraph
>>  	DocBookInInfo         always
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  
>> diff --git a/lib/layouts/copernicus.layout b/lib/layouts/copernicus.layout
>> index 676e5d2..02cff4f 100644
>> --- a/lib/layouts/copernicus.layout
>> +++ b/lib/layouts/copernicus.layout
>> @@ -177,6 +177,7 @@ Style Received
>>  	DocBookTag      date
>>  	DocBookAttr     role='received'
>>  	DocBookInInfo   always
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style Accepted
>> @@ -188,6 +189,7 @@ Style Accepted
>>  	DocBookTag      date
>>  	DocBookAttr     role='accepted'
>>  	DocBookInInfo   always
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style Pubdiscuss
>> @@ -200,6 +202,7 @@ Style Pubdiscuss
>>  	DocBookTag      date
>>  	DocBookAttr     role='pubdiscuss'
>>  	DocBookInInfo   always
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style Revised
>> @@ -212,6 +215,7 @@ Style Revised
>>  	DocBookTag      date
>>  	DocBookAttr     role='revised'
>>  	DocBookInInfo   always
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style Published
>> @@ -224,6 +228,7 @@ Style Published
>>  	DocBookTag      date
>>  	DocBookAttr     role='published'
>>  	DocBookInInfo   always
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style Abstract
>> diff --git a/lib/layouts/dinbrief.layout b/lib/layouts/dinbrief.layout
>> index cdbf258..1c360f4 100644
>> --- a/lib/layouts/dinbrief.layout
>> +++ b/lib/layouts/dinbrief.layout
>> @@ -223,6 +223,7 @@ Style Date
>>  	DocBookAttr    ""
>>  	DocBookTagType paragraph
>>  	DocBookInInfo  always
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  # dinbrief does not emphasize the subject line
>> diff --git a/lib/layouts/europasscv.layout b/lib/layouts/europasscv.layout
>> index dc7e143..3f0e125 100644
>> --- a/lib/layouts/europasscv.layout
>> +++ b/lib/layouts/europasscv.layout
>> @@ -204,6 +204,7 @@ Style Birthday
>>  	DocBookAttr           role='birthday'
>>  	DocBookInInfo         always
>>  	DocBookWrapperTag     NONE
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style Nationality
>> @@ -214,6 +215,7 @@ Style Nationality
>>  	DocBookAttr           role='nationality'
>>  	DocBookInInfo         always
>>  	DocBookWrapperTag     NONE
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style Gender
>> @@ -224,6 +226,7 @@ Style Gender
>>  	DocBookAttr           role='gender'
>>  	DocBookInInfo         always
>>  	DocBookWrapperTag     NONE
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style BeforePicture
>> @@ -247,6 +250,7 @@ Style Picture
>>  	DocBookAttr           role='picture'
>>  	DocBookInInfo         always
>>  	DocBookWrapperTag     NONE
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style AfterPicture
>> diff --git a/lib/layouts/europecv.layout b/lib/layouts/europecv.layout
>> index c7dfbc2..756588f 100644
>> --- a/lib/layouts/europecv.layout
>> +++ b/lib/layouts/europecv.layout
>> @@ -71,6 +71,7 @@ Style Nationality
>>  	DocBookAttr           role='nationality'
>>  	DocBookInInfo         always
>>  	DocBookWrapperTag     NONE
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style Birthday
>> @@ -81,6 +82,7 @@ Style Birthday
>>  	DocBookAttr           role='birthday'
>>  	DocBookInInfo         always
>>  	DocBookWrapperTag     NONE
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style Address
>> @@ -132,6 +134,7 @@ Style Gender
>>  	DocBookAttr           role='gender'
>>  	DocBookInInfo         always
>>  	DocBookWrapperTag     NONE
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style Fax
>> @@ -168,6 +171,7 @@ Style Picture
>>  	DocBookAttr           role='picture'
>>  	DocBookInInfo         always
>>  	DocBookWrapperTag     NONE
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style AfterPicture
>> diff --git a/lib/layouts/frletter.layout b/lib/layouts/frletter.layout
>> index 4c6c41c..5331558 100644
>> --- a/lib/layouts/frletter.layout
>> +++ b/lib/layouts/frletter.layout
>> @@ -35,6 +35,7 @@ Style Date
>>  	DocBookTag      date
>>  	DocBookTagType  paragraph
>>  	DocBookInInfo   always
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  
>> diff --git a/lib/layouts/ijmpc.layout b/lib/layouts/ijmpc.layout
>> index 0ecfbb3..6cb98a5 100644
>> --- a/lib/layouts/ijmpc.layout
>> +++ b/lib/layouts/ijmpc.layout
>> @@ -211,6 +211,7 @@ InsetLayout Flex:Received
>>    DocBookTag      date
>>    DocBookAttr     role='received'
>>    DocBookTagType  inline
>> +  DocBookNoFontInside   true
>>  End
>>  
>>  InsetLayout Flex:Revised
>> @@ -232,6 +233,7 @@ InsetLayout Flex:Revised
>>    DocBookTag      date
>>    DocBookAttr     role='revised'
>>    DocBookTagType  inline
>> +  DocBookNoFontInside   true
>>  End
>>  
>>  Style Abstract
>> diff --git a/lib/layouts/ijmpd.layout b/lib/layouts/ijmpd.layout
>> index 87df4fd..ac7edc9 100644
>> --- a/lib/layouts/ijmpd.layout
>> +++ b/lib/layouts/ijmpd.layout
>> @@ -204,6 +204,7 @@ InsetLayout Flex:Received
>>    DocBookTag      date
>>    DocBookAttr     role='received'
>>    DocBookTagType  inline
>> +  DocBookNoFontInside   true
>>  End
>>  
>>  InsetLayout Flex:Revised
>> @@ -225,6 +226,7 @@ InsetLayout Flex:Revised
>>    DocBookTag      date
>>    DocBookAttr     role='revised'
>>    DocBookTagType  inline
>> +  DocBookNoFontInside   true
>>  End
>>  
>>  InsetLayout Flex:Comby
>> diff --git a/lib/layouts/jasatex.layout b/lib/layouts/jasatex.layout
>> index 10c332c..5b48359 100644
>> --- a/lib/layouts/jasatex.layout
>> +++ b/lib/layouts/jasatex.layout
>> @@ -198,6 +198,7 @@ Style Date
>>  	DocBookTag            date
>>  	DocBookTagType        paragraph
>>  	DocBookInInfo         always
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  
>> diff --git a/lib/layouts/kluwer.layout b/lib/layouts/kluwer.layout
>> index 5492d48..4072eff 100644
>> --- a/lib/layouts/kluwer.layout
>> +++ b/lib/layouts/kluwer.layout
>> @@ -172,6 +172,7 @@ Style Date
>>  	DocBookTag            date
>>  	DocBookTagType        paragraph
>>  	DocBookInInfo         always
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  
>> diff --git a/lib/layouts/lettre.layout b/lib/layouts/lettre.layout
>> index 24eacc8..30e63a3 100644
>> --- a/lib/layouts/lettre.layout
>> +++ b/lib/layouts/lettre.layout
>> @@ -256,6 +256,7 @@ Style Date
>>    DocBookTag      date
>>    DocBookTagType  paragraph
>>    DocBookInInfo   always
>> +  DocBookNoFontInside   true
>>  End
>>  
>>  #suppress date indication
>> diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
>> index 5d0d90a..f1984a1 100644
>> --- a/lib/layouts/moderncv.layout
>> +++ b/lib/layouts/moderncv.layout
>> @@ -299,6 +299,7 @@ Style Photo
>>  	DocBookAttr           role='picture'
>>  	DocBookInInfo         always
>>  	DocBookWrapperTag     NONE
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  Style Quote
>> diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
>> index ec7ba57..8b86026 100644
>> --- a/lib/layouts/scrclass.inc
>> +++ b/lib/layouts/scrclass.inc
>> @@ -238,6 +238,7 @@ Style Date
>>  	DocBookTag            date
>>  	DocBookTagType        paragraph
>>  	DocBookInInfo         always
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  
>> diff --git a/lib/layouts/scrlettr.layout b/lib/layouts/scrlettr.layout
>> index 65bf982..cd41318 100644
>> --- a/lib/layouts/scrlettr.layout
>> +++ b/lib/layouts/scrlettr.layout
>> @@ -208,6 +208,7 @@ Style Date
>>  	DocBookTagType        paragraph
>>  	DocBookWrapperTag     NONE
>>  	DocBookInInfo         always
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  
>> diff --git a/lib/layouts/scrlttr2.layout b/lib/layouts/scrlttr2.layout
>> index 30ed58d..f617fe1 100644
>> --- a/lib/layouts/scrlttr2.layout
>> +++ b/lib/layouts/scrlttr2.layout
>> @@ -328,6 +328,7 @@ Style Date
>>  	DocBookTagType        paragraph
>>  	DocBookWrapperTag     NONE
>>  	DocBookInInfo         always
>> +    DocBookNoFontInside   true
>>  End
>>  
>>  
>> diff --git a/lib/layouts/stdtitle.inc b/lib/layouts/stdtitle.inc
>> index a7e93c3..31f175e 100644
>> --- a/lib/layouts/stdtitle.inc
>> +++ b/lib/layouts/stdtitle.inc
>> @@ -78,4 +78,5 @@ Style Date
>>  	DocBookTag            date
>>  	DocBookTagType        paragraph
>>  	DocBookInInfo         always
>> +    DocBookNoFontInside   true
>>  End




More information about the lyx-devel mailing list