DocBook: implement European CV.

2024-11-22 01:59:02 +00:00 · 2020-11-14 05:44:12 +01:00 · 2020-11-14 05:44:12 +01:00 · 6f696151cf
commit 6f696151cf
parent 93bb04f907
4 changed files with 116 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -6,9 +6,37 @@

 cmake_minimum_required(VERSION 3.1.0)

+## set PATH=C:/Strawberry/perl/bin/;%PATH%
+## set PATH=C:\Users\Thibaut\Anaconda3;%PATH%
+## set PATH=C:\Program Files\CMake\bin;%PATH%
+## D:
+## cd LyX\lyx-unstable\cmake-build-debug
+## ctest -j4 -R .*docbook5
+
+set(CMAKE_CXX_STANDARD 17)
 set(GNUWIN32_DIR D:/LyX/lyx-unstable/lyx-windows-deps-msvc2017)
+set(LYX_USE_QT "QT5")
+set(LYX_REQUIRE_SPELLCHECK true)
+set(LYX_ENABLE_EXPORT_TESTS 1)
+
+set(QT_DIR D:/Qt/5.15.0/msvc2019_64)
+set(QT5_DIR D:/Qt/5.15.0/msvc2019_64)
+set(QT_MKSPECS_DIR D:/Qt/5.15.0/msvc2019_64/mkspecs)
+set(Qt5Concurrent_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Concurrent)
+set(Qt5Core_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Core)
+set(Qt5Gui_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Gui)
+set(Qt5Svg_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Svg)
+set(Qt5Widgets_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Widgets)
+set(Qt5WinExtras_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5WinExtras)
+
+LIST(PREPEND CMAKE_PROGRAM_PATH  "C:/Strawberry/perl/bin")
+LIST(PREPEND CMAKE_PROGRAM_PATH  "C:/Strawberry/c/bin")
+LIST(PREPEND CMAKE_PROGRAM_PATH  "C:/Users/Thibaut/Anaconda3")
+set(PERL_EXECUTABLE "C:/Strawberry/perl/bin/perl.exe")
+set(JAVA_EXECUTABLE "C:/Program Files/Java/jdk-15/bin/java.exe")

 set(LYX_PROJECT LyX)
+
 # Instruct cmake to not use gnu extensions,
 # this prevents the mix of '-std=c++*' and '-std=gnu++*' flags
 set(CMAKE_CXX_EXTENSIONS OFF)
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@ -480,6 +480,8 @@ export/doc/gl/Tutorial_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.
+export/examples(|/de)/Curricula_Vitae/Europe_CV_docbook5

 Sublabel: docbook poster
 # Posters cannot be properly exported, the LyX documents are too far from
--- a/lib/layouts/europasscv.layout
+++ b/lib/layouts/europasscv.layout
@ -127,7 +127,7 @@ Style Telephone
 	Argument 1
 	  LabelString	"Mobile:"
 	  Tooltip	"Mobile phone number"
-	  DocBookTag    emphasis
+	  DocBookTag    phrase
 	  DocBookAttr   role='mobile'
 	EndArgument
 	DocBookTag            phone
--- a/lib/layouts/europecv.layout
+++ b/lib/layouts/europecv.layout
@ -23,6 +23,7 @@ Style Standard
 	ParSkip		0.4
 	Align		Block
 	LabelType	No_Label
+	DocBookTag  para
 End

 Input stdcounters.inc
@ -42,36 +43,66 @@ Style Name
 	  Series	Bold
 	  Color		Blue
 	EndFont
+	DocBookTag            personname
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType block
+	DocBookInInfo         always
 End

 Style FooterName
 	CopyStyle	Name
 	LatexName	ecvfootername
 	LabelString	"Footer name:"
+	DocBookTag            personname
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperAttr    role='footer'
+	DocBookWrapperTagType block
+	DocBookInInfo         always
 End

 Style Nationality
 	CopyStyle	Name
 	LatexName	ecvnationality
 	LabelString	"Nationality:"
+	DocBookTag            date
+	DocBookAttr           role='nationality'
+	DocBookInInfo         always
+	DocBookWrapperTag     NONE
 End

 Style Birthday
 	CopyStyle	Name
 	LatexName	ecvdateofbirth
 	LabelString	"Date of birth:"
+	DocBookTag            date
+	DocBookAttr           role='birthday'
+	DocBookInInfo         always
+	DocBookWrapperTag     NONE
 End

 Style Address
 	CopyStyle	Name
 	LatexName	ecvaddress
 	LabelString	"Address:"
+	DocBookTag            NONE
+	DocBookWrapperTag     address
+	DocBookWrapperTagType block
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End

 Style Email
 	CopyStyle	Name
 	LatexName	ecvemail
 	LabelString	"E-mail:"
+	DocBookTag            email
+	DocBookTagType        paragraph
+	DocBookWrapperTag     address
+	DocBookWrapperTagType block
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End

 Style Telephone
@ -81,25 +112,47 @@ Style Telephone
 	Argument 1
 	  LabelString	"Mobile"
 	  Tooltip	"Mobile phone number"
+	  DocBookTag    phrase
+	  DocBookAttr   role='mobile'
 	EndArgument
+	DocBookTag            phone
+	DocBookTagType        paragraph
+	DocBookWrapperTag     address
+	DocBookWrapperTagType block
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End

 Style Gender
 	CopyStyle	Name
 	LatexName	ecvgender
 	LabelString	"Gender:"
+	DocBookTag            date
+	DocBookAttr           role='gender'
+	DocBookInInfo         always
+	DocBookWrapperTag     NONE
 End

 Style Fax
 	CopyStyle	Name
 	LatexName	ecvfax
 	LabelString	"Fax:"
+	DocBookTag            fax
+	DocBookTagType        paragraph
+	DocBookWrapperTag     address
+	DocBookWrapperTagType block
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End

 Style BeforePicture
 	CopyStyle	Name
 	LatexName	ecvbeforepicture
 	LabelString	"Space before picture:"
+	DocBookTag            date
+	DocBookAttr           role='before-picture'
+	DocBookInInfo         always
+	DocBookWrapperTag     NONE
 End

 Style Picture
@ -112,18 +165,28 @@ Style Picture
 	  Tooltip	"Size the photo is resized to"
 	  PassThru	1
 	EndArgument
+	DocBookTag            date
+	DocBookAttr           role='picture'
+	DocBookInInfo         always
+	DocBookWrapperTag     NONE
 End

 Style AfterPicture
 	CopyStyle	Name
 	LatexName	ecvafterpicture
 	LabelString	"Space after picture:"
+	DocBookTag            date
+	DocBookAttr           role='after-picture'
+	DocBookInInfo         always
+	DocBookWrapperTag     NONE
 End

 Style Page
 	CopyStyle	Name
 	LatexName	ecvpage
 	LabelString	"Page:"
+	DocBookTag  NONE
+	DocBookWrapperTag NONE
 End

 Style Section
@ -151,6 +214,8 @@ Style Section
 	  Series	Bold
 	EndFont
 	TocLevel	1
+	DocBookTag  title
+	DocBookTagType paragraph
 End

 Style Item
@ -168,6 +233,8 @@ Style Item
 	  AutoInsert	1
 	  LabelString	"Summary"
 	  Tooltip	"Summary of the item, can also be the time"
+	  DocBookTag    emphasis
+	  # TODO: For DocBook, this should rather be title, but it would be output in the paragraph, and not before the paragraph.
 	EndArgument
 	ParSkip		0.4
 	Align		Block
@ -178,12 +245,16 @@ Style Item
 	  Series	Bold
 	  Color		Blue
 	EndFont
+	DocBookTag      sidebar
+	DocBookTagType  block
+	DocBookItemTag  para
 End

 Style BulletedItem
 	CopyStyle	Item
 	LatexName	ecvitem*
 	LabelString	"Bulleted Item:"
+	DocBookAttr role='bulleted'
 End

 Style Begin
@ -235,6 +306,8 @@ Style MotherTongue
 	  Series	Bold
 	  Color		Blue
 	EndFont
+	DocBookTag  para
+	DocBookAttr role='mother-tongue'
 End

 Style LangHeader
@ -252,27 +325,39 @@ Style Language
 	  Mandatory	1
 	  LabelString	"Language"
 	  Tooltip	"Name of the language"
+	  DocBookTag    phrase
+	  DocBookAttr   role='language-name'
 	EndArgument
 	Argument 3
 	  Mandatory	1
 	  LabelString	"Listening"
 	  Tooltip	"Level how good you think you can listen"
+	  DocBookTag    phrase
+	  DocBookAttr   role='listening'
 	EndArgument
 	Argument 4
 	  Mandatory	1
 	  LabelString	"Reading"
 	  Tooltip	"Level how good you think you can read"
+	  DocBookTag    phrase
+	  DocBookAttr   role='reading'
 	EndArgument
 	Argument 5
 	  Mandatory	1
 	  LabelString	"Interaction"
 	  Tooltip	"Level how good you think you can conversate"
+	  DocBookTag    phrase
+	  DocBookAttr   role='speaking'
 	EndArgument
 	Argument 6
 	  Mandatory	1
 	  LabelString	"Production"
 	  Tooltip	"Level how good you think you can freely talk"
+	  DocBookTag    phrase
+	  DocBookAttr   role='writing'
 	EndArgument
+	DocBookTag  para
+	DocBookAttr role='language'
 End

 Style LastLanguage