diff --git a/src/OEBPS/Images/book-browser-context-menu.png b/src/OEBPS/Images/book-browser-context-menu.png index e258b5f..07575d8 100644 Binary files a/src/OEBPS/Images/book-browser-context-menu.png and b/src/OEBPS/Images/book-browser-context-menu.png differ diff --git a/src/OEBPS/Images/chevron-down.png b/src/OEBPS/Images/chevron-down.png deleted file mode 100644 index ea34b23..0000000 Binary files a/src/OEBPS/Images/chevron-down.png and /dev/null differ diff --git a/src/OEBPS/Images/chevron-up.png b/src/OEBPS/Images/chevron-up.png deleted file mode 100644 index 3ed09b0..0000000 Binary files a/src/OEBPS/Images/chevron-up.png and /dev/null differ diff --git a/src/OEBPS/Images/count-all.svg b/src/OEBPS/Images/count-all.svg new file mode 100644 index 0000000..c8d2246 --- /dev/null +++ b/src/OEBPS/Images/count-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/OEBPS/Images/dry-run-replace-dialog.png b/src/OEBPS/Images/dry-run-replace-dialog.png new file mode 100644 index 0000000..31de726 Binary files /dev/null and b/src/OEBPS/Images/dry-run-replace-dialog.png differ diff --git a/src/OEBPS/Images/find-replace-basic.png b/src/OEBPS/Images/find-replace-basic.png index bdb60bb..4ecb2ca 100644 Binary files a/src/OEBPS/Images/find-replace-basic.png and b/src/OEBPS/Images/find-replace-basic.png differ diff --git a/src/OEBPS/Images/find-replace-options.png b/src/OEBPS/Images/find-replace-options.png index 27b8e75..029a72f 100644 Binary files a/src/OEBPS/Images/find-replace-options.png and b/src/OEBPS/Images/find-replace-options.png differ diff --git a/src/OEBPS/Images/find.svg b/src/OEBPS/Images/find.svg new file mode 100644 index 0000000..d7456e3 --- /dev/null +++ b/src/OEBPS/Images/find.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/OEBPS/Images/replace-all.svg b/src/OEBPS/Images/replace-all.svg new file mode 100644 index 0000000..8814c75 --- /dev/null +++ b/src/OEBPS/Images/replace-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/OEBPS/Images/replace-delete-unwanted.png b/src/OEBPS/Images/replace-delete-unwanted.png new file mode 100644 index 0000000..4fed9af Binary files /dev/null and b/src/OEBPS/Images/replace-delete-unwanted.png differ diff --git a/src/OEBPS/Images/replace-find.svg b/src/OEBPS/Images/replace-find.svg new file mode 100644 index 0000000..ed9179d --- /dev/null +++ b/src/OEBPS/Images/replace-find.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/OEBPS/Images/replace.svg b/src/OEBPS/Images/replace.svg new file mode 100644 index 0000000..5567126 --- /dev/null +++ b/src/OEBPS/Images/replace.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/OEBPS/Images/restart.svg b/src/OEBPS/Images/restart.svg new file mode 100644 index 0000000..9b5cb19 --- /dev/null +++ b/src/OEBPS/Images/restart.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/OEBPS/Images/saved-search-counts-report.png b/src/OEBPS/Images/saved-search-counts-report.png new file mode 100644 index 0000000..3bb8fbd Binary files /dev/null and b/src/OEBPS/Images/saved-search-counts-report.png differ diff --git a/src/OEBPS/Images/saved-searches-editing-controls.png b/src/OEBPS/Images/saved-searches-editing-controls.png index 2d95909..1c4467b 100644 Binary files a/src/OEBPS/Images/saved-searches-editing-controls.png and b/src/OEBPS/Images/saved-searches-editing-controls.png differ diff --git a/src/OEBPS/Images/saved-searches-find-replace-context-menu.png b/src/OEBPS/Images/saved-searches-find-replace-context-menu.png index 91cd622..8c83875 100644 Binary files a/src/OEBPS/Images/saved-searches-find-replace-context-menu.png and b/src/OEBPS/Images/saved-searches-find-replace-context-menu.png differ diff --git a/src/OEBPS/Images/saved-searches-main.png b/src/OEBPS/Images/saved-searches-main.png index 46d8ab3..d088f19 100644 Binary files a/src/OEBPS/Images/saved-searches-main.png and b/src/OEBPS/Images/saved-searches-main.png differ diff --git a/src/OEBPS/Images/sigil_dark.png b/src/OEBPS/Images/sigil_dark.png index f897029..cdcc807 100644 Binary files a/src/OEBPS/Images/sigil_dark.png and b/src/OEBPS/Images/sigil_dark.png differ diff --git a/src/OEBPS/Images/sigil_light.png b/src/OEBPS/Images/sigil_light.png index e235b6c..a5ca2d2 100644 Binary files a/src/OEBPS/Images/sigil_light.png and b/src/OEBPS/Images/sigil_light.png differ diff --git a/src/OEBPS/Images/tutorial-find-adv-options.png b/src/OEBPS/Images/tutorial-find-adv-options.png index 0673579..029a72f 100644 Binary files a/src/OEBPS/Images/tutorial-find-adv-options.png and b/src/OEBPS/Images/tutorial-find-adv-options.png differ diff --git a/src/OEBPS/Images/tutorial-find-adv-page.png b/src/OEBPS/Images/tutorial-find-adv-page.png index e7ecbb0..20b3241 100644 Binary files a/src/OEBPS/Images/tutorial-find-adv-page.png and b/src/OEBPS/Images/tutorial-find-adv-page.png differ diff --git a/src/OEBPS/Images/tutorial-find-adv-regex-chapter.png b/src/OEBPS/Images/tutorial-find-adv-regex-chapter.png deleted file mode 100644 index 90b4e92..0000000 Binary files a/src/OEBPS/Images/tutorial-find-adv-regex-chapter.png and /dev/null differ diff --git a/src/OEBPS/Images/tutorial-find-adv-regex.png b/src/OEBPS/Images/tutorial-find-adv-regex.png index 75ea27d..5a42d63 100644 Binary files a/src/OEBPS/Images/tutorial-find-adv-regex.png and b/src/OEBPS/Images/tutorial-find-adv-regex.png differ diff --git a/src/OEBPS/Images/tutorial-find-adv-replace.png b/src/OEBPS/Images/tutorial-find-adv-replace.png index e3c98eb..4f39b59 100644 Binary files a/src/OEBPS/Images/tutorial-find-adv-replace.png and b/src/OEBPS/Images/tutorial-find-adv-replace.png differ diff --git a/src/OEBPS/Images/tutorial-find-all.png b/src/OEBPS/Images/tutorial-find-all.png index 086fd9c..e479285 100644 Binary files a/src/OEBPS/Images/tutorial-find-all.png and b/src/OEBPS/Images/tutorial-find-all.png differ diff --git a/src/OEBPS/Images/tutorial-find-count.png b/src/OEBPS/Images/tutorial-find-count.png index db46547..c87be17 100644 Binary files a/src/OEBPS/Images/tutorial-find-count.png and b/src/OEBPS/Images/tutorial-find-count.png differ diff --git a/src/OEBPS/Images/tutorial-find-regex-chapter.png b/src/OEBPS/Images/tutorial-find-regex-chapter.png index 1642643..d5071bf 100644 Binary files a/src/OEBPS/Images/tutorial-find-regex-chapter.png and b/src/OEBPS/Images/tutorial-find-regex-chapter.png differ diff --git a/src/OEBPS/Images/tutorial-find-start.png b/src/OEBPS/Images/tutorial-find-start.png index 2ff93a5..f7912e1 100644 Binary files a/src/OEBPS/Images/tutorial-find-start.png and b/src/OEBPS/Images/tutorial-find-start.png differ diff --git a/src/OEBPS/Images/tutorial-preview.png b/src/OEBPS/Images/tutorial-preview.png index e2ad24f..f800acc 100644 Binary files a/src/OEBPS/Images/tutorial-preview.png and b/src/OEBPS/Images/tutorial-preview.png differ diff --git a/src/OEBPS/Images/tutorial-saved-epub.png b/src/OEBPS/Images/tutorial-saved-epub.png index d857390..3170710 100644 Binary files a/src/OEBPS/Images/tutorial-saved-epub.png and b/src/OEBPS/Images/tutorial-saved-epub.png differ diff --git a/src/OEBPS/Images/ui_customize_view_menu.png b/src/OEBPS/Images/ui_customize_view_menu.png index 4a597ad..16195c9 100644 Binary files a/src/OEBPS/Images/ui_customize_view_menu.png and b/src/OEBPS/Images/ui_customize_view_menu.png differ diff --git a/src/OEBPS/Images/ui_customize_window_redock_as_tab.png b/src/OEBPS/Images/ui_customize_window_redock_as_tab.png deleted file mode 100644 index 2ccf9cc..0000000 Binary files a/src/OEBPS/Images/ui_customize_window_redock_as_tab.png and /dev/null differ diff --git a/src/OEBPS/Images/ui_customize_window_redocked_as_panel.png b/src/OEBPS/Images/ui_customize_window_redocked_as_panel.png index 2fadadf..c3d245c 100644 Binary files a/src/OEBPS/Images/ui_customize_window_redocked_as_panel.png and b/src/OEBPS/Images/ui_customize_window_redocked_as_panel.png differ diff --git a/src/OEBPS/Images/ui_customize_window_redocked_as_tab.png b/src/OEBPS/Images/ui_customize_window_redocked_as_tab.png index afc68a2..fee1253 100644 Binary files a/src/OEBPS/Images/ui_customize_window_redocked_as_tab.png and b/src/OEBPS/Images/ui_customize_window_redocked_as_tab.png differ diff --git a/src/OEBPS/Text/automate.xhtml b/src/OEBPS/Text/automate.xhtml index 422c2c6..9844d63 100644 --- a/src/OEBPS/Text/automate.xhtml +++ b/src/OEBPS/Text/automate.xhtml @@ -46,7 +46,7 @@
Since unexpected errors can always occur, it is a good idea to start your Automate List with a RepoCommit command to create a full Checkpoint of your existing EPUB. That way, if an Automate List fails, you can easily recover your entire EPUB using Sigil’s Checkpoint Restore feature. (For more information on using checkpoints, see Using Checkpoints to Quickly Save/Restore EPUB State.
-Automate Lists are simple text files located in the root of your Sigil Preferences directory. They are named: automate01.txt, automate02.txt and automate03.txt. As such, you can edit them using any text editor if you like. To jump directly to your Sigil Preferences directory, go to
diff --git a/src/OEBPS/Text/book_browser.xhtml b/src/OEBPS/Text/book_browser.xhtml index cfdac4e..0c123a3 100644 --- a/src/OEBPS/Text/book_browser.xhtml +++ b/src/OEBPS/Text/book_browser.xhtml @@ -218,6 +218,10 @@ (on Mac: ) and click the button in the lower left corner.Stylesheets are applied in the order listed when the document is rendered.
+Link existing javascript files to the selected HTML files (EPUB3 Only). Choose the javascript files from the dialog window. Only javascripts marked with a checkmark will be linked; unchecked javascript files will be unlinked.
+Add Semantics allows you to designate the semantic type for selected files from a scrolling list of choices. EPUB ereaders may use this information (stored in the .opf file in EPUB2 and .opf and nav files in EPUB3) to guide them in how to present these files to readers. Each file can have only one semantic type.
diff --git a/src/OEBPS/Text/find_replace.xhtml b/src/OEBPS/Text/find_replace.xhtml index f7143c2..b731821 100644 --- a/src/OEBPS/Text/find_replace.xhtml +++ b/src/OEBPS/Text/find_replace.xhtml @@ -24,7 +24,7 @@ -When open, the Find & Replace dialog is always positioned at the bottom of the editing window for easy access. Click the chevron in the lower left corner to show or hide Options.
+When open, the Find & Replace dialog is always positioned at the bottom of the editing window for easy access. Advanced regular expression options have their own menu.
Keyboard shortcuts exist for all Find & Replace operations, such as Ctrl+F to find and Ctrl+G to find again (on Mac use Cmd instead of Ctrl). See the menu for a list of shortcuts.
@@ -32,9 +32,9 @@The buttons on the right are used to run your search commands: Find, Replace, Replace/Find, Replace All, and Count All.
+The buttons on the right are used to run your search commands: Find , Restart, Replace, Replace/Find, Replace All, and Count All.
-Finds the next occurrence of your search term and highlights it in Code View.
@@ -43,7 +43,7 @@Any text in the Replace box is ignored if you are just doing a Find.
@@ -56,12 +56,12 @@Status messages appear in the lower right corner.
Restarts a multiple file Find and and Replace Search back at the top of the first file. The next Find will begin from there.
-Replaces one occurrence of the text matched by Find.
@@ -72,18 +72,18 @@To undo changes, use Ctrl+Z (on Mac: Cmd+Z) or the Undo button , or right-click in the Code View window and select to change the text back. But if you are replacing across multiple files and your next match is in a different file, you need to switch back to the file containing the replaced text before selecting undo.
Replaces one occurence of the next match then automatically finds and highlights the subsequent match.
+Replaces one occurrence of the next match then automatically finds and highlights the subsequent match.
The first time you do a Replace/Find the first match will be highlighted but not replaced. Subsequent use of Replace/Find will replace the highlighted matched text and then automatically find the next match.
@@ -94,18 +94,17 @@If you don’t see the
button, click the chevron in the bottom left corner of the Find & Replace window or use its keyboard shortcut.You can safely use Replace/Find instead of Find if no text is selected since it will act just like Find until a match is highlighted.
Replaces all text matching your search term with your replace term, according to your settings. This is done all at once automatically.
@@ -120,37 +119,76 @@Replace All always replaces from the start of a file.
To avoid unpleasant surprises, test your find and replace string using Count All to see if the number of matches is in the expected range. You can also test with a simple Replace a few times before using Replace All.
+To avoid unpleasant surprises, test your find and replace string using Count All to see if the number of matches is in the expected range. You can also tests with a simple Replace a few times.
+ +Starting with Sigil-1.9.10 you can use the Dry-Run Replace All tool to safely see all of the potential replacements in one table before actually performing any replacements.
Save your book or create a Checkpoint before a Replace All and check it for issues afterward.
Before executing a Replace All, check if your mode is set for Current File or All HTML Files.
Counts the number of times the search term you entered in the Find text box occurs in the selected files, then displays the results in the lower right corner of the Find & Replace window. Count All uses all Mode settings including Up/Down, plus the Wrap option.
-If you don’t see the
- button, click the chevron in the bottom left corner of the Find & Replace window or use its keyboard shortcut.To count all matches in the selected files:
It’s a good idea to use Count All before doing a Replace All to confirm that the number of replacements will be what you expect. You should also run it after a Replace All in case the particular search and replace created new matches.
+It’s a good idea to use Count All before doing a Replace All to confirm that the number of replacements will be what you expect. You should also run it after a Replace All in case the particular search and replace created new matches. Alternatively use the new Dry Run Replace All tool (see next).
Often when crafting regular expression for Find and Replace, it is difficult to know if your find string will properly detect the cases you want while excluding the cases you do not want. This table shows the results of a trial dry-run of your current find and replace terms in context. No actual replacements/changes are ever made. The amount of context both "before" and "after" a match (in characters) can be controlled by the user. This tool can by launched by Shift clicking on the Count-All button.
+ + + +Dry Run Replace All allows the user to safely experiment with their search terms to see which if any would be most effective. Any row in the table can be double-clicked and the exact context for that particular match will be brought up in CodeView for the user to examine in more detail or to edit. This way a user can verify that a find replace all sequence will do exactly what they expect it to do. If the user makes changes to the underlying text that will impact the table, the user can click on the "Refresh" button at any time to force the table to be rebuilt.
+ +To create a Dry Run Replace All Table:
+ +This tool helps users use Find and Replace All more effectively. It lists all of the matches found in context and shows each replacement in that same context. The amount of context both "before" and "after" a match (in characters) can be controlled by the user.
+ + + +If the user sees a match that is unwanted - i.e. they do not want that replacement to be made, they can select that match's row in the table and use the delete key or select delete on the pop-up menu to remove it. When all unwanted matches have been found and deleted, the user can then use the "Apply Changes" button to have just the changes remaining in the table made.
+ +Filter Replacements allows the user to more safely use Replace All by lowering the risk or undesirable replacements.
+ +To create a Filter Replacements Table:
+ +The Options menu offers useful switches when using Regex mode, as well as a checkbox to control whether Wrap in the Current File is turned on or off.
-If options are hidden, click the chevron in the bottom left corner to show them.
-Click the chevron to hide the options.
-Search Options include:
+Regular Expression Search Options include:
DotAll: This regex option prepends (?s) to all regex searches and is used when you want .* to match any character, even across lines.
Minimal Match: This regex option prepends (?U) to all regex searches and is used when you want a pattern to match the shortest occurrence instead of the longest match.
Auto-Tokenise: When using Ctrl-F (on Mac: Cmd-F) on selected text to copy it into the Find box, this will convert spaces to \s and escape certain characters so they are suitable for regex.
Other General Search Options
+ +Wrap: When enabled in Current File mode, if your search reaches the end of the file, it will automatically wrap around to the beginning of the file to continue the search (or the reverse if searching Up). When disabled, searches will stop at the end of the file (or the beginning if searching Up).
When searching in a mode that uses multiple files, when your search reaches the last file (in the order listed in the Book Browser), you will need to use the
button otherwise the search will stop. Wrap does not apply when searching multiple files.Text: When enabled in any mode, if searching XHTML files, it will match only text outside of < XHTML tags >. This option has no effect when not searching in XHTML files.
+ +This is can be useful when doing find and replace on words that can incidentally be valid XHTML attributes, attribute values, or tag names that you no want to replace.
+Save Search: Save the current Find & Replace search to Saved Searches.
Tokenise Selection: Convert spaces to \s and escape certain characters.
Clear Find Replace History: Clears out the all recent historyor previous Find and Replace values.