From de00cd31c52430ee330b539a900d4b5fc100dd66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Milde?= <milde@lyx.org>
Date: Sun, 5 May 2019 18:19:46 +0200
Subject: [PATCH] Prevent auto-loading of package bookmark with KOMA-classes
 for Japanese documents.

Bookmark clashes with platex leading to errors for Postscript and PDF (ps2pdf) output.
---
 lib/doc/ja/Additional.lyx                      | 2 +-
 lib/doc/ja/Customization.lyx                   | 2 +-
 lib/doc/ja/DummyDocument1.lyx                  | 1 +
 lib/doc/ja/DummyDocument2.lyx                  | 1 +
 lib/doc/ja/EmbeddedObjects.lyx                 | 2 +-
 lib/doc/ja/Math.lyx                            | 2 +-
 lib/doc/ja/UserGuide.lyx                       | 2 +-
 lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx | 2 +-
 8 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx
index c7c8214327..de97bb60cb 100644
--- a/lib/doc/ja/Additional.lyx
+++ b/lib/doc/ja/Additional.lyx
@@ -40,7 +40,7 @@
 
 \usepackage{t1enc}
 \end_preamble
-\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading
+\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,bookmarkpackage=false
 \use_default_options false
 \begin_modules
 logicalmkup
diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx
index e6ef1b666b..e42b35b38d 100644
--- a/lib/doc/ja/Customization.lyx
+++ b/lib/doc/ja/Customization.lyx
@@ -24,7 +24,7 @@
   \myTOC
   \mainmatter }
 \end_preamble
-\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading
+\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,bookmarkpackage=false
 \use_default_options false
 \begin_modules
 logicalmkup
diff --git a/lib/doc/ja/DummyDocument1.lyx b/lib/doc/ja/DummyDocument1.lyx
index b6c1b549a9..019a2a8dd0 100644
--- a/lib/doc/ja/DummyDocument1.lyx
+++ b/lib/doc/ja/DummyDocument1.lyx
@@ -5,6 +5,7 @@
 \save_transient_properties true
 \origin /systemlyxdir/doc/ja/
 \textclass scrbook
+\options bookmarkpackage=false
 \use_default_options false
 \maintain_unincluded_children false
 \language japanese
diff --git a/lib/doc/ja/DummyDocument2.lyx b/lib/doc/ja/DummyDocument2.lyx
index c9cc4de83a..89a0e8867a 100644
--- a/lib/doc/ja/DummyDocument2.lyx
+++ b/lib/doc/ja/DummyDocument2.lyx
@@ -5,6 +5,7 @@
 \save_transient_properties true
 \origin /systemlyxdir/doc/ja/
 \textclass scrbook
+\options bookmarkpackage=false
 \use_default_options false
 \maintain_unincluded_children false
 \language japanese
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index 1b95711888..fc60b22cfa 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -168,7 +168,7 @@
 \DeclareCaptionOption{large}[]{\def\captionfont{\large}}
 \DeclareCaptionOption{Large}[]{\def\captionfont{\Large}}
 \end_preamble
-\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,dvipsnames,table
+\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,dvipsnames,table,bookmarkpackage=false
 \use_default_options false
 \begin_modules
 initials
diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx
index 492a10b941..f181cfedc3 100644
--- a/lib/doc/ja/Math.lyx
+++ b/lib/doc/ja/Math.lyx
@@ -141,7 +141,7 @@
 
 \renewcommand{\seename}{→}
 \end_preamble
-\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,samesize
+\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,samesize,bookmarkpackage=false
 \use_default_options true
 \begin_modules
 subequations
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 8759112123..f464eff8c0 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -48,7 +48,7 @@
 \DeclareCaptionOption{large}[]{\def\captionfont{\large}}
 \DeclareCaptionOption{Large}[]{\def\captionfont{\Large}}
 \end_preamble
-\options refpage,intoc,bibliography=totoc,index=totoc,BCOR7.5mm,captions=tableheading
+\options refpage,intoc,bibliography=totoc,index=totoc,BCOR7.5mm,captions=tableheading,bookmarkpackage=false
 \use_default_options false
 \begin_modules
 customHeadersFooters
diff --git a/lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx b/lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx
index 1a57f28d83..0fb6fef3f3 100644
--- a/lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx
+++ b/lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx
@@ -28,7 +28,7 @@
   L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}
   {LyX}}
 \end_preamble
-\options BCOR7.5mm
+\options BCOR7.5mm,bookmarkpackage=false
 \use_default_options false
 \maintain_unincluded_children false
 \language japanese