stzn · stzn · Jun 6, 2023 · Jun 3, 2023 · Jun 4, 2023 · Jun 4, 2023
diff --git a/README.md b/README.md
@@ -6,7 +6,8 @@
 
 ## バージョン履歴
 
-- 2022/8/1 Swift5.7(beta)
+- 2023/6/4 Swift5.9(beta)
+- 2022/9/12 Swift5.7
 - 2022/3/16 Swift5.6
 - 2021/9/21 Swift5.5
 

diff --git a/SUMMARY.md b/SUMMARY.md
@@ -28,6 +28,7 @@
 * [オプショナルチェーン\(Optional Chaining\)](language-guide/optional-chaining.md)
 * [エラー処理\(Error Handling\)](language-guide/error-handling.md)
 * [同時並行処理\(Concurrency\)](language-guide/concurrency.md)
+* [マクロ\(Macros\)](language-guide/macros.md)
 * [型キャスト\(Type Casting\)](language-guide/type-casting.md)
 * [ネスト型\(Nested Types\)](language-guide/nested-types.md)
 * [拡張\(Extensions\)](language-guide/extensions.md)

diff --git a/Style.md b/Style.md
@@ -30,9 +30,14 @@ TSPL は 3 つの主なパートに加えて、補完的な機能を提供する
 
 # 用語とルール
 
+## 属性名
+
+ガイドでは、属性名の前に `@` を書きます。
+リファレンスでは、省略します。
+
 ## back deploy
 
-2 つの単語でつづり、1 単語にしたり、ハイフンを付けない。
+2 つの単語でつづり、1 単語にしたり、ハイフンを付けません。
 
 ## コンパイラ
 
@@ -52,6 +57,11 @@ TSPL は 3 つの主なパートに加えて、補完的な機能を提供する
 
 "member-wise"のようにハイフンをつけないでください。
 
+## マクロ名
+
+ガイドでは付属マクロ(attached macros)を指す場合は名前の前に `@` を、自立式マクロ(freestanding macros)を指す場合は名前の前に `#` を記述します。
+リファレンスでは、省略します。
+
 ## メソッド
 
 「関数」の項目を見てください。

diff --git a/assets/04_dictionarycreating.png b/assets/04_dictionarycreating.png
diff --git a/assets/05_availabilitycondition.png b/assets/05_availabilitycondition.png
diff --git a/assets/05_lebeledstatements.png b/assets/05_lebeledstatements.png
diff --git a/assets/05_repeatwhile.png b/assets/05_repeatwhile.png
diff --git a/assets/05_switchform.png b/assets/05_switchform.png
diff --git a/assets/05_whileform.png b/assets/05_whileform.png
diff --git a/assets/07_closureexpressionsyntax.png b/assets/07_closureexpressionsyntax.png
diff --git a/assets/14_convenienceInitializer.png b/assets/14_convenienceInitializer.png
diff --git a/assets/14_designatedInitializer.png b/assets/14_designatedInitializer.png
diff --git a/assets/17_errorHandling.png b/assets/17_errorHandling.png
diff --git a/assets/actor_declaration.png b/assets/actor_declaration.png
diff --git a/assets/array_expression.png b/assets/array_expression.png
diff --git a/assets/array_type.png b/assets/array_type.png
diff --git a/assets/arrayliteral_2x.png b/assets/arrayliteral_2x.png
diff --git a/assets/assignment_operator.png b/assets/assignment_operator.png
diff --git a/assets/asynchronous_functions_and_methods.png b/assets/asynchronous_functions_and_methods.png
diff --git a/assets/attributes.png b/assets/attributes.png
diff --git a/assets/available.png b/assets/available.png
diff --git a/assets/await_operator.png b/assets/await_operator.png
diff --git a/assets/await_throw_closure_expression.png b/assets/await_throw_closure_expression.png
diff --git a/assets/binary_expression.png b/assets/binary_expression.png
diff --git a/assets/break_statement.png b/assets/break_statement.png
diff --git a/assets/class_declaration.png b/assets/class_declaration.png
diff --git a/assets/closure_expression.png b/assets/closure_expression.png
diff --git a/assets/code_blocks.png b/assets/code_blocks.png
diff --git a/assets/computed_variables_and_computed_properties.png b/assets/computed_variables_and_computed_properties.png
diff --git a/assets/constant_declaration.png b/assets/constant_declaration.png
diff --git a/assets/continue_statement.png b/assets/continue_statement.png
diff --git a/assets/defer_statement.png b/assets/defer_statement.png
diff --git a/assets/deinitializer_declaration.png b/assets/deinitializer_declaration.png
diff --git a/assets/deprecated.png b/assets/deprecated.png
diff --git a/assets/dictionary_expression.png b/assets/dictionary_expression.png
diff --git a/assets/dictionary_type.png b/assets/dictionary_type.png
diff --git a/assets/do_catch_statement.png b/assets/do_catch_statement.png
diff --git a/assets/enumerations_with_cases_of_a_raw-value_type.png b/assets/enumerations_with_cases_of_a_raw-value_type.png
diff --git a/assets/enumerations_with_cases_of_any_type.png b/assets/enumerations_with_cases_of_any_type.png
diff --git a/assets/error_warning_compiler_statement.png b/assets/error_warning_compiler_statement.png
diff --git a/assets/explicit_member_expression.png b/assets/explicit_member_expression.png
diff --git a/assets/extension_declaration.png b/assets/extension_declaration.png
diff --git a/assets/extension_declaration2.png b/assets/extension_declaration2.png
diff --git a/assets/for-in_statement.png b/assets/for-in_statement.png
diff --git a/assets/forced-Value_expression.png b/assets/forced-Value_expression.png
diff --git a/assets/function_call_expression1.png b/assets/function_call_expression1.png
diff --git a/assets/function_call_expression2.png b/assets/function_call_expression2.png
diff --git a/assets/function_declaration.png b/assets/function_declaration.png
diff --git a/assets/function_declaration2.png b/assets/function_declaration2.png
diff --git a/assets/function_type.png b/assets/function_type.png
diff --git a/assets/generic-argument-list.png b/assets/generic-argument-list.png
diff --git a/assets/generic-parameter-list.png b/assets/generic-parameter-list.png
diff --git a/assets/generic-where-clauses.png b/assets/generic-where-clauses.png
diff --git a/assets/guard_statement.png b/assets/guard_statement.png
diff --git a/assets/if_compiler_statement.png b/assets/if_compiler_statement.png
diff --git a/assets/if_else_statement.png b/assets/if_else_statement.png
diff --git a/assets/if_elseif_compiler_statement.png b/assets/if_elseif_compiler_statement.png
diff --git a/assets/if_elseif_statement.png b/assets/if_elseif_statement.png
diff --git a/assets/if_statement.png b/assets/if_statement.png
diff --git a/assets/implicit_member_expression.png b/assets/implicit_member_expression.png
diff --git a/assets/import_declaration.png b/assets/import_declaration.png
diff --git a/assets/import_declaration2.png b/assets/import_declaration2.png
diff --git a/assets/infix_operator_declaration.png b/assets/infix_operator_declaration.png
diff --git a/assets/initializer_declaration.png b/assets/initializer_declaration.png
diff --git a/assets/initializer_declaration2.png b/assets/initializer_declaration2.png
diff --git a/assets/initializer_expression.png b/assets/initializer_expression.png
diff --git a/assets/inout_expression.png b/assets/inout_expression.png
diff --git a/assets/introduced.png b/assets/introduced.png
diff --git a/assets/key-path_expression.png b/assets/key-path_expression.png
diff --git a/assets/key-path_string_expression.png b/assets/key-path_string_expression.png
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/message.png b/assets/message.png
diff --git a/assets/multipleline_strings.png b/assets/multipleline_strings.png
diff --git a/assets/obsoleted.png b/assets/obsoleted.png
diff --git a/assets/opaque_type.png b/assets/opaque_type.png
diff --git a/assets/optional-chaining_expression.png b/assets/optional-chaining_expression.png
diff --git a/assets/parameter_names.png b/assets/parameter_names.png
diff --git a/assets/parameter_names2.png b/assets/parameter_names2.png
diff --git a/assets/postfix_operator_declaration.png b/assets/postfix_operator_declaration.png
diff --git a/assets/postfix_self_expression.png b/assets/postfix_self_expression.png
diff --git a/assets/precedence_group_declaration.png b/assets/precedence_group_declaration.png
diff --git a/assets/prefix_operator_declaration.png b/assets/prefix_operator_declaration.png
diff --git a/assets/protocol_compose_type.png b/assets/protocol_compose_type.png
diff --git a/assets/protocol_declaration.png b/assets/protocol_declaration.png
diff --git a/assets/protocol_property_declaration.png b/assets/protocol_property_declaration.png
diff --git a/assets/protocol_subscript_declaration.png b/assets/protocol_subscript_declaration.png
diff --git a/assets/regex-literal-1.png b/assets/regex-literal-1.png
diff --git a/assets/regex-literal-2.png b/assets/regex-literal-2.png
diff --git a/assets/renamed.png b/assets/renamed.png
diff --git a/assets/repeat-while_statement.png b/assets/repeat-while_statement.png
diff --git a/assets/return_statement.png b/assets/return_statement.png
diff --git a/assets/selector_expression.png b/assets/selector_expression.png
diff --git a/assets/self_expression.png b/assets/self_expression.png
diff --git a/assets/singleline_strings.png b/assets/singleline_strings.png
diff --git a/assets/sourceLocation_compiler_statement.png b/assets/sourceLocation_compiler_statement.png
diff --git a/assets/special_kinds-of_parameters.png b/assets/special_kinds-of_parameters.png
diff --git a/assets/stored_variable_observers_and_property_observers.png b/assets/stored_variable_observers_and_property_observers.png
diff --git a/assets/string_delimited_by_extended_delimiters.png b/assets/string_delimited_by_extended_delimiters.png
diff --git a/assets/structure_declaration.png b/assets/structure_declaration.png
diff --git a/assets/subscript_declaration.png b/assets/subscript_declaration.png
diff --git a/assets/subscript_expression.png b/assets/subscript_expression.png
diff --git a/assets/superclass_expression.png b/assets/superclass_expression.png
diff --git a/assets/switch_statement.png b/assets/switch_statement.png
diff --git a/assets/ternary_conditional_operator.png b/assets/ternary_conditional_operator.png
diff --git a/assets/throw_statement.png b/assets/throw_statement.png
diff --git a/assets/throwing_functions_and_methods.png b/assets/throwing_functions_and_methods.png
diff --git a/assets/try!_operator.png b/assets/try!_operator.png
diff --git a/assets/try_hatena_operator.png b/assets/try_hatena_operator.png
diff --git a/assets/try_operator.png b/assets/try_operator.png
diff --git a/assets/tuple_expression.png b/assets/tuple_expression.png
diff --git a/assets/type-casting_patterns.png b/assets/type-casting_patterns.png
diff --git a/assets/type-parameter-constraint.png b/assets/type-parameter-constraint.png
diff --git a/assets/type_alias_declaration.png b/assets/type_alias_declaration.png
diff --git a/assets/type_casting_operator.png b/assets/type_casting_operator.png
diff --git a/assets/variable_declaration.png b/assets/variable_declaration.png
diff --git a/assets/while_statement.png b/assets/while_statement.png
diff --git a/language-guide/closures.md b/language-guide/closures.md
@@ -63,7 +63,11 @@ var reversedNames = names.sorted(by: backward)
 
 クロージャ式の構文には、次の一般的な形式があります:
 
-![&#x30AF;&#x30ED;&#x30FC;&#x30B8;&#x30E3;&#x5F0F;&#x69CB;&#x6587;](../assets/07_closureexpressionsyntax.png)
+```swift
+{ (<#parameters#>) -> <#return type#> in
+   <#statements#>
+}
+```
 
 クロージャ式構文のパラメータは、in-out パラメータをとることもできますが、デフォルト値を設定することはできません。可変長パラメータに名前を付けると、可変長パラメータを使用できます。タプルも、パラメータの型および戻り値の型として使用できます。
 

diff --git a/language-guide/collection-types.md b/language-guide/collection-types.md
@@ -78,7 +78,9 @@ var sixDoubles = threeDoubles + anotherThreeDoubles
 
 配列リテラルからも配列を初期化できます。これは、1 つ以上の要素を持った配列コレクションの簡略記法です。配列リテラルはカンマ区切りの角括弧\(`[]`\)で囲んだ値のリストです:
 
-![Array Literal](../assets/arrayliteral_2x.png)
+```swift
+[<#value 1#>, <#value 2#>, <#value 3#>]
+```
 
 下記の例は、`String` を保持する `shoppingList` という配列を作成しています。
 
@@ -475,7 +477,9 @@ namesOfIntegers = [:]
 
 _キーバリューペア_は、キーとバリューの組み合わせです。辞書リテラルは、それぞれのキーバリューペアのキーとバリューをコロン\(`:`\)で分けます。複数のキーバリューペアは、カンマ\(`,`\)区切りのリストを角括弧\(`[]`\)で囲みます:
 
-![&#x8F9E;&#x66F8;&#x306E;&#x4F5C;&#x6210;](../assets/04_dictionarycreating.png)
+```swift
+[<#key 1#>: <#value 1#>, <#key 2#>: <#value 2#>, <#key 3#>: <#value 3#>]
+```
 
 下記の例では、国際空港の名前を保持する辞書を作成します。この辞書は、3 文字の国際空港コードをキーに、空港名をバリューにしています。
 

diff --git a/language-guide/control-flow.md b/language-guide/control-flow.md
@@ -117,7 +117,11 @@ for tickMark in stride(from: 3, through: hours, by: hourInterval) {
 
 `while` ループの基本的な書き方は下記の通りです:
 
-![While&#x30EB;&#x30FC;&#x30D7;](../assets/05_whileform.png)
+```swift
+while <#condition#> {
+   <#statements#>
+}
+```
 
 下記の例は、_蛇とはしご_と呼ばれるシンプルなゲームの例です。
 
@@ -184,7 +188,11 @@ print("ゲームオーバー!")
 
 下記が `repeat-while` ループの一般的な形式です。
 
-![repeat-while](../assets/05_repeatwhile.png)
+```swift
+repeat {
+   <#statements#>
+} while <#condition#>
+```
 
 ここで蛇とはしごの例を `while` の代わりに `repeat-while` を使用して書き換えてみます。`finalSquare`、`board`、`square` と `diceRoll` は `while` と全く同じ方法で初期化します。
 
@@ -362,7 +370,17 @@ let weatherAdvice = if temperatureInCelsius > 100 {
 
 最もシンプルな形式として、`switch` 文は同じ型の 1 つ以上の値を比較します。
 
-![switch](../assets/05_switchform.png)
+```swift
+switch <#some value to consider#> {
+case <#value 1#>:
+    <#respond to value 1#>
+case <#value 2#>,
+    <#value 3#>:
+    <#respond to value 2 or 3#>
+default:
+    <#otherwise, do something else#>
+}
+```
 
 全ての `switch` 文は、`case` キーワードで始まる複数の可能性があるケースで構成されます。特定の値の比較に加えて、さらに複雑なパターンマッチをケースに指定するための様々な方法を提供しています。この章で後ほど記載しています。
 
@@ -711,7 +729,11 @@ Swift では、より複雑な制御フローを作成するために、ルー
 
 ラベル付き文は、文の導入キーワードの前にコロン\(`:`\)を付けて同じ行にラベルを配置することで示せます。下記は、`while` ループの構文の例ですが、他の全てのループや `switch` にも同じ原則が当てはまります。
 
-![&#x30E9;&#x30D9;&#x30EB;&#x4ED8;&#x304D;&#x6587;](../assets/05_lebeledstatements.png)
+```swift
+<#label name#>: while <#condition#> {
+   <#statements#>
+}
+```
 
 次の例は、この章の前で見てきた「蛇とはしご」にラベル付き `while` ループと `break` と `continue` 文を適用したバージョンです。今回は、追加のルールがあります。
 
@@ -873,7 +895,13 @@ if #available(iOS 10, macOS 10.12, *) {
 
 基本的な形式として、アベイラビリティ条件はプラットフォームの名前とバージョンのリストを受け取ります。`iOS`、`macOS`、`watchOS`、`tvOS` などをプラットフォームの名前として使います。全リストは[宣言属性\(Declaration Attributes\)](../language-reference/attributes.md)を参照ください。`iOS 8` や `macOS 10.10` のようなメジャーバージョンに加え、`iOS 11.2.6` や `macOS 10.13.3` のようにマイナーバージョンも指定できます。
 
-![API&#x30A2;&#x30D9;&#x30A4;&#x30E9;&#x30D3;&#x30EA;&#x30C6;&#x30A3;&#x6761;&#x4EF6;](../assets/05_availabilitycondition.png)
+```swift
+if #available(<#platform name#> <#version#>, <#...#>, *) {
+    <#statements to execute if the APIs are available#>
+} else {
+    <#fallback statements to execute if the APIs are unavailable#>
+}
+```
 
 `guard` 文でアベイラビリティ条件を使用すると、そのコードブロック内の残りのコードに使用されるアベイラビリティ情報が絞り込まれます。
 

diff --git a/language-guide/error-handling.md b/language-guide/error-handling.md
@@ -136,7 +136,20 @@ struct PurchasedSnack {
 
 `do-catch` 文の一般的な形式は次のとおりです:
 
-![do catch&#x6587;](../assets/17_errorHandling.png)
+```swift
+do {
+    try <#expression#>
+    <#statements#>
+} catch <#pattern 1#> {
+    <#statements#>
+} catch <#pattern 2#> where <#condition#> {
+    <#statements#>
+} catch <#pattern 3#>, <#pattern 4#> where <#condition#> {
+    <#statements#>
+} catch {
+    <#statements#>
+}
+```
 
 その句が処理できるエラーを示すには、`catch` の後にパターンを記述します。`catch` 句にパターンがない場合、句は全てのエラーに一致し、エラーを `error` という名前のローカル定数にバインドします。パターンマッチングの詳細については、[Patterns\(パターン\)](../language-reference/patterns.md)を参照ください。
 

diff --git a/language-guide/initialization.md b/language-guide/initialization.md
@@ -344,11 +344,19 @@ convenience イニシャライザは二次的なもので、クラスのイニ
 
 クラスの指定イニシャライザは、値型のシンプルなイニシャライザと同じ方法で記述します:
 
-![&#x6307;&#x5B9A;&#x30A4;&#x30CB;&#x30B7;&#x30E3;&#x30E9;&#x30A4;&#x30B6;](../assets/14_designatedInitializer.png)
+```swift
+init(<#parameters#>) {
+   <#statements#>
+}
+```
 
 covenience イニシャライザは同じスタイルで記述できますが、`init` キーワードの前にスペース区切りで `covenience` 修飾子を配置します:
 
-![covenience &#x30A4;&#x30CB;&#x30B7;&#x30E3;&#x30E9;&#x30A4;&#x30B6;](../assets/14_convenienceInitializer.png)
+```swift
+convenience init(<#parameters#>) {
+   <#statements#>
+}
+```
 
 ### <a id="initializer-delegation-for-class-types">クラス型のイニシャライザの委譲\(Initializer Delegation for Class Types\)</a>