Compare commits

...

6 Commits

Author SHA1 Message Date
TEC caa23dcb70
etc/ORG-NEWS: Mention the new \P entity 2023-04-13 15:05:44 +08:00
TEC 87543ee6fb
oc-csl: Recognise ¶/§ entity locators
* lisp/oc-csl.el: Recognise org-entity based paragraph and section
locators "\P" and "\S".
2023-04-13 14:52:14 +08:00
TEC 798fb3aaa9
org-entities: Treat ¶ similarly to §
* lisp/org-entities.el: Treat pilcrows / paragraph symbols similarly to
section symbols (§), move them next to each other and add a \P entity.
2023-04-13 14:52:14 +08:00
TEC bc91d8e72b
org-entities: § is a section sign, not paragraph
* lisp/org-entities.el: Correct the ASCII version of § to be "section",
not "paragraph".
2023-04-13 14:52:14 +08:00
TEC 2e26a3757b
ob-tangle: Edit default file mode to match docstr
* lisp/ob-tangle.el (org-babel-tangle-default-file-mode): The docstring
states that it the default value is read-write for the user, read only
for everyone else.  This is not consistent with the default value which
is actually read-*execute* for the user, read only for everyone else.
The default value is updated to be read-write for the user, as stated in
the docstring.

Reported-by: Ruijie Yu <ruijie@netyu.xyz>
Link: https://list.orgmode.org/orgmode/sdv3554xtat.fsf@fw.net.yu
2023-04-13 14:51:16 +08:00
TEC d035cc36cd
ob-tangle: Fix interpretation of rw-r--r-- modes
* lisp/ob-tangle.el (org-babel-interpret-file-mode): When specifying a
file mode in the "rw-r--r--" style, this is interpreted by splicing the
user, group, and other compenents into a "u=rw,g=r,o=r" style string and
applying `file-modes-symbolic-to-number`.  For correct interpretation,
we need to ensure the dashes are removed in this process.
2023-04-13 13:46:15 +08:00
4 changed files with 19 additions and 8 deletions

View File

@ -209,6 +209,12 @@ from Clojure and ClojureScript.
This is now handled with an optional function parameter in This is now handled with an optional function parameter in
the respective functions that need this information. the respective functions that need this information.
*** New org-entity alias: =\P= for =\para=
For symmetry with =\S= and =\sect= for the section symbol, =\P= has
been added as an another form for the pilcrow symbol currently
available as =\para=.
* Version 9.6 * Version 9.6
** Important announcements and breaking changes ** Important announcements and breaking changes

View File

@ -158,9 +158,9 @@ result. The default value is `org-remove-indentation'."
:version "24.1" :version "24.1"
:type 'function) :type 'function)
(defcustom org-babel-tangle-default-file-mode #o544 (defcustom org-babel-tangle-default-file-mode #o644
"The default mode used for tangled files, as an integer. "The default mode used for tangled files, as an integer.
The default value 356 correspands to the octal #o544, which is The default value 420 correspands to the octal #o644, which is
read-write permissions for the user, read-only for everyone else." read-write permissions for the user, read-only for everyone else."
:group 'org-babel-tangle :group 'org-babel-tangle
:package-version '(Org . "9.6") :package-version '(Org . "9.6")
@ -361,9 +361,9 @@ Did you give the decimal value %1$d by mistake?" mode)))
;; Match regexp taken from `file-modes-symbolic-to-number'. ;; Match regexp taken from `file-modes-symbolic-to-number'.
(file-modes-symbolic-to-number mode org-babel-tangle-default-file-mode)) (file-modes-symbolic-to-number mode org-babel-tangle-default-file-mode))
((string-match-p "^[r-][w-][xs-][r-][w-][xs-][r-][w-][x-]$" mode) ((string-match-p "^[r-][w-][xs-][r-][w-][xs-][r-][w-][x-]$" mode)
(file-modes-symbolic-to-number (concat "u=" (substring mode 0 3) (file-modes-symbolic-to-number (concat "u=" (delete ?- (substring mode 0 3))
",g=" (substring mode 3 6) ",g=" (delete ?- (substring mode 3 6))
",o=" (substring mode 6 9)) ",o=" (delete ?- (substring mode 6 9)))
0)) 0))
(t (error "File mode %S not recognized as a valid format. See `org-babel-interpret-file-mode'." mode)))) (t (error "File mode %S not recognized as a valid format. See `org-babel-interpret-file-mode'." mode))))

View File

@ -382,13 +382,17 @@ If nil then the Chicago author-date style is used as a fallback.")
("paragraph" . "paragraph") ("paragraph" . "paragraph")
("para." . "paragraph") ("para." . "paragraph")
("paras." . "paragraph") ("paras." . "paragraph")
("\\P" . "paragraph")
("" . "paragraph") ("" . "paragraph")
("\\P\\P" . "paragraph")
("¶¶" . "paragraph") ("¶¶" . "paragraph")
("part" . "part") ("part" . "part")
("pt." . "part") ("pt." . "part")
("pts." . "part") ("pts." . "part")
("§" . "section") ("§" . "section")
("\\S" . "section")
("§§" . "section") ("§§" . "section")
("\\S\\S" . "section")
("section" . "section") ("section" . "section")
("sec." . "section") ("sec." . "section")
("secs." . "section") ("secs." . "section")

View File

@ -272,8 +272,10 @@ packages to be loaded, add these packages to `org-latex-packages-alist'."
("vert" "\\vert{}" t "&vert;" "|" "|" "|") ("vert" "\\vert{}" t "&vert;" "|" "|" "|")
("vbar" "|" nil "|" "|" "|" "|") ("vbar" "|" nil "|" "|" "|" "|")
("brvbar" "\\textbrokenbar{}" nil "&brvbar;" "|" "¦" "¦") ("brvbar" "\\textbrokenbar{}" nil "&brvbar;" "|" "¦" "¦")
("S" "\\S" nil "&sect;" "paragraph" "§" "§") ("S" "\\S" nil "&sect;" "section" "§" "§")
("sect" "\\S" nil "&sect;" "paragraph" "§" "§") ("sect" "\\S" nil "&sect;" "section" "§" "§")
("P" "\\P{}" nil "&para;" "paragraph" "" "")
("para" "\\P{}" nil "&para;" "paragraph" "" "")
("amp" "\\&" nil "&amp;" "&" "&" "&") ("amp" "\\&" nil "&amp;" "&" "&" "&")
("lt" "\\textless{}" nil "&lt;" "<" "<" "<") ("lt" "\\textless{}" nil "&lt;" "<" "<" "<")
("gt" "\\textgreater{}" nil "&gt;" ">" ">" ">") ("gt" "\\textgreater{}" nil "&gt;" ">" ">" ">")
@ -489,7 +491,6 @@ packages to be loaded, add these packages to `org-latex-packages-alist'."
("checkmark" "\\checkmark" t "&check;" "[checkmark]" "[checkmark]" "") ("checkmark" "\\checkmark" t "&check;" "[checkmark]" "[checkmark]" "")
"** Miscellaneous (seldom used)" "** Miscellaneous (seldom used)"
("para" "\\P{}" nil "&para;" "[pilcrow]" "" "")
("ordf" "\\textordfeminine{}" nil "&ordf;" "_a_" "ª" "ª") ("ordf" "\\textordfeminine{}" nil "&ordf;" "_a_" "ª" "ª")
("ordm" "\\textordmasculine{}" nil "&ordm;" "_o_" "º" "º") ("ordm" "\\textordmasculine{}" nil "&ordm;" "_o_" "º" "º")
("cedil" "\\c{}" nil "&cedil;" "[cedilla]" "¸" "¸") ("cedil" "\\c{}" nil "&cedil;" "[cedilla]" "¸" "¸")