Make upLaTeX a default compiler for Japanese documents

lib/configure.py

@@ -635,7 +635,7 @@ def checkLatex(dtl_tools):
     ''' Check latex, return lyx_check_config '''
     path, LATEX = checkProg('a Latex2e program', ['latex $$i', 'latex2e $$i'])
     #-----------------------------------------------------------------
-    path, PLATEX = checkProg('pLaTeX, the Japanese LaTeX', ['platex $$i'])
+    path, PLATEX = checkProg('pLaTeX, the Japanese LaTeX', ['uplatex $$i', 'platex $$i'])
     if PLATEX:
         # check if PLATEX is pLaTeX2e
         writeToFile('chklatex.ltx', r'\nonstopmode\makeatletter\@@end')

lib/examples/ja/Articles/Japanese_Article_%28JLReq_Class%29.lyx

@@ -539,6 +539,7 @@ LaTeXプリアンブル
 \end_layout
 
 \begin_layout JLReq Setup
+
 sidenote_type=symbol
 \end_layout
 
@@ -2340,7 +2341,22 @@ appendix_
 \end_inset
 
 に変えることによって，
-本文部分／後付け／付録に関する設定に変えることができます．
+本文部分／後付け／付録に関する設定に変えることができます（これらは
+\begin_inset Flex MenuItem
+status collapsed
+
+\begin_layout Plain Layout
+\begin_inset Info
+type  "l7n"
+arg   "Japanese Book (JLReq Class)"
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+でのみ使用することができます）．
 \end_layout
 
 \begin_layout Itemize

lib/layouts/jlreq-book.layout

@@ -20,3 +20,43 @@ Input jlreq-common.inc
 ClassOptions
 	Other	book
 End
+
+Style Front_Matter
+	Category             Structure
+	LatexType            Command
+	LatexName            frontmatter
+	KeepEmpty            1
+	ResetArgs            1
+	Margin               First_Dynamic
+	NextNoIndent         1
+	ParSkip              0
+	TopSep               2.5
+	BottomSep            0.5
+	ParSep               0
+	Align                Center
+	LabelType            Static
+	LabelBottomSep       0
+	LeftMargin           M
+	LabelString          "--- Front Matter ---"
+
+	Font
+	  Family             Sans
+	  Series             Bold
+	  Size               Largest
+	  Color              textlabel1
+	EndFont
+End
+
+Style Main_Matter
+	CopyStyle            Front_Matter
+	Category             Structure
+	LatexName            mainmatter
+	LabelString          "--- Main Matter ---"
+End
+
+Style Back_Matter
+	CopyStyle            Front_Matter
+	Category             Structure
+	LatexName            backmatter
+	LabelString          "--- Back Matter ---"
+End

lib/layouts/jlreq-common.inc

@@ -1,104 +1,104 @@
 # Japanese jlreq textclass definition file.
-# Author : Koji Yokota (yokota6@gmail.com)
+# Author : Koji Yokota (yokota@lyx.org)
 #
 # This class internally loads following packages:
-# Any time:			 	l3keys2e, lmodern
+# Any time:          l3keys2e, lmodern
-# With non-LuaLaTeX:	everyhook
+# With non-LuaLaTeX: everyhook
-# With LuaLaTeX:		luatexja, luatexja-adjust
+# With LuaLaTeX:     luatexja, luatexja-adjust
 
 Format 107
 
 Style Part
 	Argument post:1
-		LabelString		"Subtitle|u"
+		LabelString  "Subtitle|u"
-		Tooltip			"Subtitle of the part"
+		Tooltip      "Subtitle of the part"
-		InsertCotext	1
+		InsertCotext 1
 	EndArgument
 End
 
 Style Part*
 	Argument post:1
-		LabelString		"Subtitle|u"
+		LabelString  "Subtitle|u"
-		Tooltip			"Subtitle of the part"
+		Tooltip      "Subtitle of the part"
-		InsertCotext	1
+		InsertCotext 1
 	EndArgument
 End
 
 Style Chapter
 	Argument post:1
-		LabelString		"Subtitle|u"
+		LabelString  "Subtitle|u"
-		Tooltip			"Subtitle of the chapter"
+		Tooltip      "Subtitle of the chapter"
-		InsertCotext	1
+		InsertCotext 1
 	EndArgument
 	TocLevel 0
 End
 
 Style Chapter*
 	Argument post:1
-		LabelString		"Subtitle|u"
+		LabelString  "Subtitle|u"
-		Tooltip			"Subtitle of the chapter"
+		Tooltip      "Subtitle of the chapter"
-		InsertCotext	1
+		InsertCotext 1
 	EndArgument
 End
 
 Style Section
 	Argument post:1
-		LabelString		"Subtitle|u"
+		LabelString  "Subtitle|u"
-		Tooltip			"Subtitle of the section"
+		Tooltip      "Subtitle of the section"
-		InsertCotext	1
+		InsertCotext 1
 	EndArgument
 	TocLevel 1
 End
 
 Style Section*
 	Argument post:1
-		LabelString		"Subtitle|u"
+		LabelString  "Subtitle|u"
-		Tooltip			"Subtitle of the section"
+		Tooltip      "Subtitle of the section"
-		InsertCotext	1
+		InsertCotext 1
 	EndArgument
 End
 
 Style Subsection
 	Argument post:1
-		LabelString		"Subtitle|u"
+		LabelString  "Subtitle|u"
-		Tooltip			"Subtitle of the subsection"
+		Tooltip      "Subtitle of the subsection"
-		InsertCotext	1
+		InsertCotext 1
 	EndArgument
 	TocLevel 2
 End
 
 Style Subsection*
 	Argument post:1
-		LabelString		"Subtitle|u"
+		LabelString  "Subtitle|u"
-		Tooltip			"Subtitle of the subsection"
+		Tooltip      "Subtitle of the subsection"
-		InsertCotext	1
+		InsertCotext 1
 	EndArgument
 End
 
 Style Subsubsection
 	Argument post:1
-		LabelString		"Subtitle|u"
+		LabelString  "Subtitle|u"
-		Tooltip			"Subtitle of the subsubsection"
+		Tooltip      "Subtitle of the subsubsection"
-		InsertCotext	1
+		InsertCotext 1
 	EndArgument
 	TocLevel 3
 End
 
 Style Subsubsection*
 	Argument post:1
-		LabelString		"Subtitle|u"
+		LabelString  "Subtitle|u"
-		Tooltip			"Subtitle of the subsubsection"
+		Tooltip      "Subtitle of the subsubsection"
-		InsertCotext	1
+		InsertCotext 1
 	EndArgument
 End
 
 Style Abstract_over_Columns
-	CopyStyle			Abstract
+	CopyStyle            Abstract
-	InTitle               		1
+	InTitle              1
-	LabelString			"Abstract"
+	LabelString          "Abstract"
-	Category			FrontMatter
+	Category             FrontMatter
-	LatexType			Command
+	LatexType            Command
-	LatexName			jlreqabstract
+	LatexName            jlreqabstract
 	Preamble
 		\newcommand{\jlreqabstract}[1]{%
 		\begin{abstract}%
@@ -109,39 +109,39 @@ Style Abstract_over_Columns
 End
 
 Style JLReq_Setup
-	InPreamble			1
+	InPreamble           1
-	LatexType			Command
+	LatexType            Command
-	LatexName			jlreqsetup
+	LatexName            jlreqsetup
-	Category			FrontMatter
+	Category             FrontMatter
-	LabelType			Static
+	LabelType            Static
-	LabelString			"JLReq Setup"
+	LabelString          "JLReq Setup"
-	LabelSep			"M"
+	LabelSep             "M"
-	LeftMargin			"MMMMMMM"
+	LeftMargin           "MMMMMMM"
 	Font
-		Family			Typewriter
+		Family       Typewriter
-		Size			Small
+		Size         Small
 	EndFont
 	LabelFont
-		Color			eolmarker
+		Color        eolmarker
-		Family			Sans
+		Family       Sans
 	EndFont
-	ParagraphGroup		1
+	ParagraphGroup       1
-	PassThru			1
+	PassThru             1
-	HTMLTag				!--
+	HTMLTag              !--
 End
 
 InsetLayout Flex:Endnote
-	LyxType				custom
+	LyxType              custom
-	LatexType			Command
+	LatexType            Command
-	LatexName			endnote
+	LatexName            endnote
-	Counter				footnote
+	Counter              footnote
-	Decoration			Classic
+	Decoration           Classic
-	LabelString			"Endnote"
+	LabelString          "Endnote"
-	ForcePlain			1
+	ForcePlain           1
-	BgColor				background
+	BgColor              background
 	ResetsFont true
-	HTMLLabel			\arabic{footnote}
+	HTMLLabel            \arabic{footnote}
-	HTMLInnerTag        div
+	HTMLInnerTag         div
 	HTMLStyle
 		span.flex_endnote_label {
 			vertical-align: super;
@@ -165,18 +165,18 @@ InsetLayout Flex:Endnote
 			padding: 1em;
 		}
 	EndHTMLStyle
-	AddToToc              footnote
+	AddToToc             footnote
-	IsTocCaption          true
+	IsTocCaption         true
-	DocBookTag            footnote
+	DocBookTag           footnote
-	DocBookTagType        inline
+	DocBookTagType       inline
 End
 
 InsetLayout Flex:Sidenote
-	CopyStyle			Flex:Endnote
+	CopyStyle            Flex:Endnote
-	LatexName			sidenote
+	LatexName            sidenote
-	LabelString			"Sidenote"
+	LabelString          "Sidenote"
-	HTMLLabel			\arabic{footnote}
+	HTMLLabel            \arabic{footnote}
-	HTMLInnerTag        div
+	HTMLInnerTag         div
 	HTMLStyle
 		span.flex_sidenote_label {
 			vertical-align: super;
@@ -201,21 +201,21 @@ InsetLayout Flex:Sidenote
 		}
 	EndHTMLStyle
 	Argument post:1
-		LabelString		"Note"
+		LabelString  "Note"
-		MenuString		"Endnote contents"
+		MenuString   "Endnote contents"
-		Tooltip			"Contents of the sidenote. Only makes sense when \jlreqsetup{sidenote_type=symbol} is specified in the preamble."
+		Tooltip      "Contents of the sidenote. Only makes sense when \jlreqsetup{sidenote_type=symbol} is specified in the preamble."
-		Mandatory		0
+		Mandatory    0
-		LeftDelim		{
+		LeftDelim    {
-		RightDelim		}
+		RightDelim   }
 	EndArgument
 End
 
 InsetLayout Flex:Warichu
-	CopyStyle			Flex:Endnote
+	CopyStyle            Flex:Endnote
-	LatexName			warichu
+	LatexName            warichu
-	LabelString			"Warichu"
+	LabelString          "Warichu"
-	HTMLLabel			\arabic{footnote}
+	HTMLLabel            \arabic{footnote}
-	HTMLInnerTag        div
+	HTMLInnerTag         div
 	HTMLStyle
 		span.flex_warichu_label {
 			vertical-align: super;
@@ -242,17 +242,17 @@ InsetLayout Flex:Warichu
 End
 
 InsetLayout Flex:Warichu*
-	CopyStyle			Flex:Warichu
+	CopyStyle            Flex:Warichu
-	LatexName			warichu*
+	LatexName            warichu*
-	LabelString			"Warichu*"
+	LabelString          "Warichu*"
-	PassThru			1
+	PassThru             1
-	MultiPar			1
+	MultiPar             1
-	ParbreakIgnored		1
+	ParbreakIgnored      1
 	Font
-		Family			Typewriter
+	        Family       Typewriter
 	EndFont
-	HTMLLabel			\arabic{footnote}
+	HTMLLabel            \arabic{footnote}
-	HTMLInnerTag        div
+	HTMLInnerTag         div
 	HTMLStyle
 		span.flex_warichu__label {
 			vertical-align: super;
@@ -279,36 +279,36 @@ InsetLayout Flex:Warichu*
 End
 
 InsetLayout Flex:Tatechuyoko
-	LatexType			Command
+	LatexType            Command
-	LyxType				charstyle
+	LyxType              charstyle
-	LatexName			tatechuyoko*
+	LatexName            tatechuyoko*
-	LabelString			"Tatechuyoko"
+	LabelString          "Tatechuyoko"
-	Decoration			Conglomerate
+	Decoration           Conglomerate
 End
 
 InsetLayout Flex:Jidori
-	CopyStyle			Flex:Tatechuyoko
+	CopyStyle            Flex:Tatechuyoko
-	LatexName			jidori
+	LatexName            jidori
-	LabelString			"Jidori"
+	LabelString          "Jidori"
 	Argument 1
-		LabelString		"Length"
+		LabelString  "Length"
-		MenuString		"Jidori Length|L"
+		MenuString   "Jidori Length|L"
-		Tooltip			"Length of Jidori. Contents is fit to this length."
+		Tooltip      "Length of Jidori. Contents is fit to this length."
-		Mandatory		1
+		Mandatory    1
-		AutoInsert		1
+		AutoInsert   1
 	EndArgument
 End
 
 InsetLayout Flex:Akigumi
-	CopyStyle			Flex:Tatechuyoko
+	CopyStyle            Flex:Tatechuyoko
-	LatexName			akigumi
+	LatexName            akigumi
-	LabelString			"Akigumi"
+	LabelString          "Akigumi"
-	MenuString			"Akigumi (LuaLaTeX)"
+	MenuString           "Akigumi (LuaLaTeX)"
 	Argument 1
-		LabelString		"Char Space"
+		LabelString  "Char Space"
-		MenuString		"Char Space|D"
+		MenuString   "Char Space|D"
-		Tooltip			"Distance between chars is set to this length."
+		Tooltip      "Distance between chars is set to this length."
-		Mandatory		1
+		Mandatory    1
-		AutoInsert		1
+		AutoInsert   1
 	EndArgument
 End