Kovid Goyal
a70e028fb6
Use ffdoc in template_lang.rst
...
Also dont include :ffdoc: in .po file
2024-11-15 12:01:12 +05:30
Kovid Goyal
a68f51cccc
Bump version for preview release
2024-11-15 10:31:59 +05:30
Kovid Goyal
c4a03f309a
Another invalid backslash escape and also remove use of EscapedCharNode that doesnt exist
2024-11-15 07:28:18 +05:30
Kovid Goyal
2cb7b68714
Merge branch 'master' of https://github.com/cbhaley/calibre
2024-11-15 07:11:31 +05:30
Charles Haley
9cf17543fe
1) Add a "bold" tag.
...
2) fix indenting in RST output. Indents were lost in some cases.
3) Compact spacing around <code> tags in HTML by striping newlines off the text.
2024-11-14 16:47:35 +00:00
Charles Haley
a5c99c7496
1) Change to an r-string to make it easier to edit and test in external programs. Doubled backslashes are a bother when doing copy/paste.
...
2) Updates and corrections to the information text.
2024-11-14 16:45:07 +00:00
Kovid Goyal
c100405f1e
Merge branch 'master' of https://github.com/cbhaley/calibre
...
Fixes #2088135 [MDE: Enumerated dropdown breaks after using 'Clear' button](https://bugs.launchpad.net/calibre/+bug/2088135 )
2024-11-14 21:29:39 +05:30
Charles Haley
5b99c03701
Bug #2088135 : Enumerated dropdown breaks after using 'Clear' button
2024-11-14 14:49:40 +00:00
Kovid Goyal
f41f83f0a2
Fix various unescaped backslashes
...
Also ``...`` syntax doesnt work when it contains markup that itself uses
`. For example: ``:ref:`...``` renders as :ref:`... without the trailing `.
Didnt bother to fix just removed instances of it.
2024-11-14 08:44:22 +05:30
Kovid Goyal
2ca21b16f8
...
2024-11-14 08:23:09 +05:30
Kovid Goyal
e035674bdb
Merge branch 'master' of https://github.com/cbhaley/calibre
2024-11-14 08:21:57 +05:30
Charles Haley
0253793c69
Changes and bug fixes:
...
- Add an action to ui.py to define a possible shortcut for opening the template documentation editor.
- Better exception handling in the template doc editor
- Add a dialog giving general information about formatter functions. Use FFML to test it.
- Add a button to template_dialog.py to open the general information dialog.
- Add escaping characters to FFML. Characters are escaped with backslash. Useful if one wants to enter something that looks like FFML but is supposed to be text. Example: escaping the opening bracket in \[CODE] turns it into a string instead of a tag.
2024-11-13 21:39:05 +00:00
Kovid Goyal
d06185156a
Allow running doc editor via calibre-debug
...
Use
calibre-debug -c "from calibre.gui2.dialogs.ff_doc_editor import main; main()"
2024-11-13 20:48:04 +05:30
Kovid Goyal
7430a74bd9
Merge branch 'master' of https://github.com/cbhaley/calibre
2024-11-13 20:46:22 +05:30
Charles Haley
c097c450c1
The __main__ stuff to allow the dialog to run under calibre-debug -c
2024-11-13 14:30:54 +00:00
Charles Haley
2b625a173e
New commit removing the action.
2024-11-13 14:29:31 +00:00
Kovid Goyal
58a418cca9
...
2024-11-13 18:05:21 +05:30
Kovid Goyal
7cc2fb7278
Merge branch 'tolino_5_4_197982' of https://github.com/beedaddy/calibre
2024-11-13 18:04:58 +05:30
Martin Brodbeck
08e7089570
Bump supported fw version in kobo/tolino driver
...
New Tolino Shine 5 firmware 5.4.197982 still uses db version 190.
Using new USB ids for detecting Tolino models.
2024-11-13 11:37:28 +01:00
Kovid Goyal
0c86a7918f
Add issue links
2024-11-13 09:10:35 +05:30
Kovid Goyal
3959627970
Micro-optimisation
2024-11-13 08:28:37 +05:30
Kovid Goyal
80ac7d893a
Merge branch 'master' of https://github.com/cbhaley/calibre
2024-11-13 08:27:23 +05:30
Kovid Goyal
80092ec338
string changes
2024-11-13 08:24:45 +05:30
Charles Haley
fb1657d54d
Improvements to the switch function documentation
2024-11-12 23:42:37 +00:00
Charles Haley
38b9f15897
Changes to TranslatedStringWithRaw to support the documentation editor I am writing.
2024-11-12 23:35:13 +00:00
Charles Haley
266be27bc3
Undo changes to the switch function. The new documentation left out the first parameter, in effect documenting the usage in single function mode.
2024-11-12 18:30:17 +00:00
Kovid Goyal
078e2a2654
Various fixes to template formatter function help strings as pointed out by translators
2024-11-12 21:14:18 +05:30
Kovid Goyal
ee3a9492a1
Discard trailing () of ref automatically
2024-11-12 20:44:46 +05:30
Kovid Goyal
60d0f43a62
Fix incorrect ref syntax in one place
2024-11-12 20:42:03 +05:30
Kovid Goyal
1ee299ee2a
Merge branch 'master' of https://github.com/cbhaley/calibre
2024-11-12 20:41:59 +05:30
Kovid Goyal
bcfdfc1e1d
And yet more crap with pykakasi
2024-11-12 20:38:57 +05:30
Kovid Goyal
04d5728ef9
More work on de-vendoring pykakasi
2024-11-12 19:52:31 +05:30
Charles Haley
da9332a535
Start using :ref: links.
...
Note: I will look at generating HTML links once I see what the anchors look like in the new generated template_ref document. Today they look like
https://manual.calibre-ebook.com/generated/en/template_ref.html#add-x-y
I'm hoping that in the new system they will look something like
https://manual.calibre-ebook.com/generated/en/template_ref.html#ff_add
adding the ff_ and removing the parameters.
2024-11-12 12:07:31 +00:00
Charles Haley
38587e0b0a
Add :ref: links. Also reorder code to be closer to alphabetical order.
...
This commit assumes your answer to my last email (about :ref:) is "yes". If it isn't then reject the commit.
2024-11-12 11:25:46 +00:00
Kovid Goyal
ec8c06caa9
Fix a regression that caused incorrect English transliteration of Japanese text even when the UI language is set to Japanese. Fixes #2087850 [[Enhancement] PLease use kakasi for Japanese]( https://bugs.launchpad.net/calibre/+bug/2087850 )
...
Devendor pykakasi. Upstream one seems to be in working order so use it.
2024-11-12 15:13:58 +05:30
Kovid Goyal
7a3571cf56
Use the new indent parameter instead of indenting manually
2024-11-12 09:57:55 +05:30
Kovid Goyal
77d4d2a370
Merge branch 'master' of https://github.com/cbhaley/calibre
2024-11-12 09:53:21 +05:30
Charles Haley
b638823ac0
Now using your suggestion of overriding "_()"
2024-11-11 16:17:10 +00:00
Charles Haley
279c56a61b
Various changes:
...
- Added the "Show in original English" checkbox using the raw_doc method I described in my email.
- Changes to use "raw_doc" in formatter_functions.
- Corrections and improvements to documentation for several functions.
2024-11-11 15:06:29 +00:00
Charles Haley
12c4a7b97f
Minor fix to prefixes in ffml_processor.
2024-11-11 12:29:54 +00:00
Charles Haley
bf488a43a8
Several changes:
...
- As requested, document_to_rst() now takes an indent. It also takes a prefix in case the RST is a list item.
- Fixes to escaping when generating HTML.
- Change the documentation in formatter_functions.py to use 'r' strings, as discussed.
- Fixes to the new DocViewer class.
- Show stored templates and user template functions in DocViewer.
This commit contains un_pogaz's changes (I think).
2024-11-11 12:26:17 +00:00
Kovid Goyal
7ecc30663f
Use QTextBrowser for browsing template function documentation
2024-11-11 11:40:57 +05:30
Kovid Goyal
6b91f666e4
pep8
2024-11-11 11:14:39 +05:30
Kovid Goyal
ec445d6c32
Implement indentation for :ffdoc:
2024-11-11 11:12:50 +05:30
Kovid Goyal
c55e66a40a
Check how :ffdoc: works for more complex functions
...
We need to add a parameter to set output indentation otherwise
sub lists and code blocks break the outer list.
2024-11-11 10:48:24 +05:30
Kovid Goyal
6458b10f4b
Add a new RST role :ffdoc: to insert the generated RST markup for a formatter function
...
Needs testing to ensure that it works when called in contexts likea
bulleted list, not sure how well the generated markup works when place
after a bullet.
2024-11-11 10:29:39 +05:30
Kovid Goyal
8c2fadc33e
string changes
2024-11-11 10:08:14 +05:30
Kovid Goyal
617b7f146d
...
2024-11-11 09:44:49 +05:30
Kovid Goyal
96b521a1ff
Port the generation of template language function reference to new code
...
Note that in other documentation, the function reference can be linked
to using
:ref:`ff_function_name` for example, :ref:`ff_add`
2024-11-11 09:38:14 +05:30
Kovid Goyal
3687ad4baf
Fix some invalid escapes in formatter_functions doc strings
2024-11-11 09:04:44 +05:30
