Skip to content

fix(punctuation): запятая на стыке «что» и «если»; два значения «по крайней мере» #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaxRyabov wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(punctuation): запятая на стыке «что» и «если»; два значения «по крайней мере» #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions skills/ru-text/references/editorial-punctuation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ compound conjunction stays whole|no|"потому что" is one unit; comma bef
negation + что|no|fixed expression: "не то что обидно"
semantically whole phrase|no|"делай что хочешь" -- indivisible
что = interrogative pronoun|no|"что случилось?" -- not a conjunction
two conjunctions without "то"|no|no comma between "что" and "если" when "то" follows
two conjunctions, "то" follows|no|"я знаю, что если он придёт, то поможет" -- no comma between "что" and "если"
two conjunctions, no "то"|yes|"я знаю, что, если он придёт, всё решится" -- comma between "что" and "если"
parallel subordinates with "и"|no|"я знаю, что он придёт и что поможет" -- no comma before second "что"

Compound conjunctions -- where to place the comma:
Expand Down Expand Up @@ -116,7 +117,8 @@ construction|comma?|rule
в свою очередь (= ответно)|no|circumstance
к сожалению|yes|introductory, emotional evaluation
к счастью|yes|introductory, emotional evaluation
по крайней мере|yes (usually)|introductory, limitation
по крайней мере (= во всяком случае)|yes|introductory, limitation: "он, по крайней мере, пытался"
по крайней мере (= не меньше чем)|no|circumstance: "пришли по крайней мере десять человек"
впрочем|yes, after (start); both sides (mid)|introductory, caveat
итак|yes, after|introductory, conclusion
следовательно|yes|introductory, conclusion
Expand Down
2 changes: 2 additions & 0 deletions tools/atom-map.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ fab675d6803e189e724e5925b998544fc92fb33b NORMALISED e70defea5989c672a5b8c22dc2aa
7dd8e93b1ca5ed18601fb2e4d5b59d0f27d5b06d NORMALISED 08cacfc5be7fc73ce672ada98301f683cd87902f The AD-7 heading. «непрошенная» → «непрошеная»: spelling, the adjective takes one н (непрошеный); the rule and its triggers are untouched. Found by a review of the rule names; the heading is the rule's name wherever it is quoted.
8a33dc511269799f497ce234aacc3ae18897beb3 NORMALISED d44a88f2e4182cb7d4114f7accb4f42a5e1623ee AD-8.3 cross-reference. It cited anti-patterns.md:90, a different row; the email closing it means is the «Если у вас возникнут дополнительные вопросы…» row, now named by its content rather than a line number (a line number drifts, and «92» collides with the stop-word count the dogfood gate guards). What the rule says is unchanged.
b8e83be567e21e2999a153ab35ce7c9bfa4ce9d9 NORMALISED dffd8fca8e683a15c54741d06227f12556b3af76 The R49 line. THE TEXT CHANGES MEANING, and this row says so rather than calling it wording: it read «без пробелов вокруг» while its own example, «Он… впрочем, неважно», has a space after the ellipsis. The text now says what the example always showed — no space before, a space after — which is also how Rozental's examples print both a pause («В департаменте… но») and an omission in a quotation («классики… рекомендовали»). The scope widens too, from «(пропуск)» to «(пауза или пропуск)», because both are set alike. The example is unchanged; the contradiction between text and example is resolved in favour of the example and the source.
34754ad6fc839d1d99eb9d887e66b92c0c9db930 NORMALISED 8718af3b5be8dfaa50decd2d41f05d5ec0e015d7 The stacked-conjunctions row of «When comma before что is NOT needed». THE MEANING IS DELIBERATELY CHANGED, and this row must not be read as cosmetic. The old label, «two conjunctions without "то"», contradicted its own explanation, «no comma … when "то" follows»: read by its first column, the row removed the comma exactly where it is required — «Я знаю, что, если он придёт, всё решится». The rule in both sources checked (Rozental's punctuation handbook, § 36; Gramota.ru's punctuation reference, entry «Что, если (бы)») turns on the second half of the double conjunction: no comma between the conjunctions when «то» follows, a comma when it does not. The one row is now two, one per case, each with its own example; this target is the «то follows» row, the direct heir of the old «no». Found in a downstream copy of the skill during review, where the literal reading had already dropped a required comma.
1077fef6128738a9286141552ab3627ea0f28d8c NORMALISED e1846ac22d06daedda6b8190f6f2d0c6107ea691 «по крайней мере» in the introductory-words table. THE MEANING IS DELIBERATELY CHANGED: «yes (usually)» told the reader to set the phrase off in both of its meanings. It is introductory only when it means «во всяком случае» («Он, по крайней мере, пытался»); when it means «не меньше чем, самое меньшее» it is a member of the sentence and takes no commas («Пришли по крайней мере десять человек»). Rozental's handbook and Gramota.ru's entry «По крайней мере» both draw the line by meaning. The row is split the way «прежде всего» and «в свою очередь» already are in the same table; this target is the introductory row, the one the old «yes» described.