diff --git a/TeXmacs/plugins/lang/dic/en_US/zh_CN.scm b/TeXmacs/plugins/lang/dic/en_US/zh_CN.scm index 637713d4dbba5dfd2d087a0eef5ac3420ce8144f..92355428a06059d06197a67d5722e94b9fd637c9 100644 --- a/TeXmacs/plugins/lang/dic/en_US/zh_CN.scm +++ b/TeXmacs/plugins/lang/dic/en_US/zh_CN.scm @@ -186,6 +186,7 @@ ("apply" "使用") ("april" "四月") ("arab" "阿拉伯") +("arabic" "阿拉伯数字") ("arc" "圆弧") ("arch series" "arch 规格") ("archaic" "古代的") @@ -475,6 +476,7 @@ ("curve" "曲线") ("custom tab" "自定义制表符") ("custom tab" "自定义制表符") +("custom page format" "自定义页面格式") ("customizations" "定制") ("customize macro" "定制宏") ("customize" "定制") @@ -874,6 +876,7 @@ ("gui" "界面") ("h modifier" "") ("hangul" "谚文") +("hanzi" "汉字数字") ("happy typing" "") ("has been aborted" "") ("has completed its task" "") @@ -1837,6 +1840,8 @@ ("rigid horizontal" "") ("rigid space" "") ("rigid" "刚性的") +("roman" "小写罗马数字") +("Roman" "大写罗马数字") ("romanian" "罗马尼亚语") ("root" "根") ("rotate backward" "") diff --git a/TeXmacs/progs/generic/document-widgets.scm b/TeXmacs/progs/generic/document-widgets.scm index 0a6accf26058c50dcc7e3e1f75d9cc5c8edfa91e..2a1e770585da15e9960816b7d206497c7b81bb4d 100644 --- a/TeXmacs/progs/generic/document-widgets.scm +++ b/TeXmacs/progs/generic/document-widgets.scm @@ -186,38 +186,6 @@ (initial-set u "pn-next" (number->string (+ next 1))) (refresh-window))) -(tm-widget ((page-number-style-editor u) quit) - (let* ((pf "") (ps "") (pe "") (nt "arabic") - (filled? (lambda (s) (and (string? s) (!= s ""))))) - (centered - (aligned - (item (text "Applying from:") - (input (set! ps answer) "string" (list ps) "6em")) - (item (text "Applying to:") - (input (set! pe answer) "string" (list pe) "6em")) - (item (text "First page:") - (input (set! pf answer) "string" (list pf) "6em")) - (item (text "Number style:") - (enum (begin (set! nt answer)) - '("arabic" "roman" "Roman" "hanzi") - "arabic" - "10em")))) - ====== - (explicit-buttons - (hlist - >>> - ("Cancel" (quit)) - // // - ("Ok" - (when (and (filled? pf) (filled? ps) - (filled? pe) (filled? nt)) - (assign-page-number u pf ps pe nt) - (quit))))))) - -(define (open-page-number-style-window u) - (dialogue-window (page-number-style-editor u) noop - "Page number style layer")) - (tm-widget (page-formatter-format u quit) (centered (refreshable "page-format-settings" @@ -243,12 +211,10 @@ (enum (initial-set u "page-crop-marks" (encode-crop-marks answer)) '("none" "a3" "a4" "letter") (decode-crop-marks (initial-get u "page-crop-marks")) - "10em")) - (item (text "Advanced page numbering:") - (explicit-buttons ("New page number style layer" - (open-page-number-style-window u))))))) - === - (centered + "10em")))) + (glue #t #f 0 25) + (hlist (bold (text "Custom page format"))) + === === (refreshable "page-user-format-settings" (when (== (initial-get u "page-type") "user") (aligned @@ -275,6 +241,38 @@ // // ("Ok" (quit))))) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Document -> Page / Numbering +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-widget (page-formatter-numbering u quit) + (let* ((pf "") (ps "") (pe "") (nt "arabic") + (filled? (lambda (s) (and (string? s) (!= s ""))))) + (centered + (aligned + (item (text "Applying from:") + (input (set! ps answer) "string" (list ps) "6em")) + (item (text "Applying to:") + (input (set! pe answer) "string" (list pe) "6em")) + (item (text "First page:") + (input (set! pf answer) "string" (list pf) "6em")) + (item (text "Number style:") + (enum (begin (set! nt answer)) + '("arabic" "roman" "Roman" "hanzi") + "arabic" + "10em")))) + ====== + (explicit-buttons + (hlist + >>> + ("Cancel" (quit)) + // // + ("Ok" + (when (and (filled? pf) (filled? ps) + (filled? pe) (filled? nt)) + (assign-page-number u pf ps pe nt) + (quit))))))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Document -> Page / Margins ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -584,6 +582,9 @@ (tab (text "Format") (padded (dynamic (page-formatter-format u quit)))) + (tab (text "Numbering") + (padded + (dynamic (page-formatter-numbering u quit)))) (tab (text "Margins") (padded (dynamic (page-formatter-margins u quit)))) diff --git a/devel/202_9.md b/devel/202_9.md index 130cca5fe1f43237daff58a0a7d450bc228ede83..7d232a3d5d156195230bc5c00823a6e0b631bed5 100644 --- a/devel/202_9.md +++ b/devel/202_9.md @@ -10,6 +10,15 @@ - 在没有填写`起始页`、`结束页`、`第一页`时,按下`确定`后页面应该无响应,需要用户填写完整信息,或者按下`取消`退出 - `高级页码`与`文档->页面`中其他功能独立,不影响其他功能的及时响应效果,也不会因为设置了其他功能而误设置页码样式层 +## 2025/12/11 + +### What +应该在 格式、边白、断行 这几个一样的位置添加页码相关的设置。页码是常用功能,比边白更常用,所以应该在格式和边白之间。 + +### How ++ 将页码与 格式、边白、断行 平级,取消 格式 标签页中的 新页码标签页 按钮。 ++ 为格式标签页下半部分的用户自定义选项添加小标题。 + ## 2025/11/16 ### What