Doc settings reset: fix default block_rendering_mode (#8792)

frontend/apps/filemanager/filemanagerutil.lua

@@ -42,6 +42,7 @@ function filemanagerutil.resetDocumentSettings(file)
     local settings_to_keep = {
         bookmarks = true,
         bookmarks_sorted = true,
+        bookmarks_sorted_20220106 = true,
         bookmarks_version = true,
         cre_dom_version = true,
         highlight = true,
@@ -57,6 +58,7 @@ function filemanagerutil.resetDocumentSettings(file)
                 doc_settings:delSetting(k)
             end
         end
+        doc_settings:makeTrue("docsettings_reset_done") -- for readertypeset block_rendering_mode
         doc_settings:close()
     end
 end

frontend/apps/reader/modules/readertypeset.lua

@@ -66,7 +66,7 @@ function ReaderTypeset:onReadSettings(config)
     if config:has("copt_block_rendering_mode") then
         self.block_rendering_mode = config:readSetting("copt_block_rendering_mode")
     else
-        if config:has("last_xpointer") then
+        if config:has("last_xpointer") and not config:has("docsettings_reset_done") then
             -- We have a last_xpointer: this book was previously opened
             self.block_rendering_mode = 0
         else

frontend/apps/reader/modules/readerview.lua

@@ -1001,6 +1001,7 @@ function ReaderView:onCloseDocument()
 end
 
 function ReaderView:onReaderReady()
+    self.ui.doc_settings:delSetting("docsettings_reset_done")
     self.settings_last_save_tv = UIManager:getTime()
 end