Revert "Fix Ticket #9741 misleading name for font-encoding setting "default"."

[lyx.git] / lib / templates / ja_beamer-conference-ornate-20min.lyx

diff --git a/lib/templates/ja_beamer-conference-ornate-20min.lyx b/lib/templates/ja_beamer-conference-ornate-20min.lyx
index f2cd7022ca18d334c3f38532fb3063faf5c09f6c..35afdec18056ef12229a2e0c9452473864eb9ccd 100644 (file)
--- a/lib/templates/ja_beamer-conference-ornate-20min.lyx
+++ b/lib/templates/ja_beamer-conference-ornate-20min.lyx
@@ -1,7 +1,9 @@
 #LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 480
+\lyxformat 508
 \begin_document
 \begin_header
+\save_transient_properties true
+\origin /systemlyxdir/templates/
 \textclass beamer
 \begin_preamble
 \usetheme{Warsaw}
@@ -21,16 +23,16 @@
 \language_package default
 \inputencoding auto
 \fontencoding global
-\font_roman times
-\font_sans default
-\font_typewriter default
-\font_math auto
+\font_roman "times" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
 \font_sc false
 \font_osf false
-\font_sf_scale 100
-\font_tt_scale 100
+\font_sf_scale 100 100
+\font_tt_scale 100 100
 \graphics default
 \default_output_format pdf
 \output_sync 0
@@ -211,8 +213,8 @@ status open
 \end_layout
 
 \begin_layout Itemize
-著者が別々の肩書を持っている場合には、「所属機関マーク」差込枠(挿入\SpecialChar \menuseparator
-任意設定差込枠\SpecialChar \menuseparator
+著者が別々の肩書を持っている場合には、「所属機関マーク」差込枠(挿入\SpecialChar menuseparator
+任意設定差込枠\SpecialChar menuseparator
 所属機関マーク)を使ってください
 \end_layout
 
@@ -291,8 +293,8 @@ status collapsed
 status collapsed
 
 \begin_layout Itemize
-複数の所属機関がある場合に限り、「所属機関マーク」差込枠(挿入\SpecialChar \menuseparator
-任意設定差込枠\SpecialChar \menuseparator
+複数の所属機関がある場合に限り、「所属機関マーク」差込枠(挿入\SpecialChar menuseparator
+任意設定差込枠\SpecialChar menuseparator
 所属機関マーク)を使ってください
 \end_layout
 
@@ -492,10 +494,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -581,10 +579,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -628,7 +622,7 @@ status collapsed
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -645,10 +639,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -693,7 +683,7 @@ status open
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -710,10 +700,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -728,10 +714,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -765,10 +747,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -803,10 +781,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -824,7 +798,7 @@ status open
 \end_layout
 
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -863,10 +837,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -884,7 +854,7 @@ status open
 
 \end_deeper
 \begin_layout Standard
-\begin_inset Separator parbreak
+\begin_inset Separator plain
 \end_inset
 
 
@@ -901,18 +871,10 @@ status open
 \end_inset
 
 
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
 \begin_layout ColumnsTopAligned
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -975,10 +937,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1097,10 +1055,6 @@ status open
 \end_inset
 
 
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1239,7 +1193,7 @@ newblock
 Journal on This and That
 \emph default
 .
- 2(1):50--100, 2000.
+ 2(1):50–100, 2000.
 \end_layout
 
 \end_deeper