* Fix note typo and resolve duplicates

audreyt · Mar 10, 2024 · 78f8e88 · 78f8e88
1 parent c86e5b2
commit 78f8e88
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/contents/english/04-02-association-and-⿻-publics.md b/contents/english/04-02-association-and-⿻-publics.md
@@ -22,7 +22,7 @@ The urgency in the voice was palpable. Faisal replied, "I can't find a secretive
 
 ---
 
-In his classic summary of his observations of *Democracy in America*, French aristocrat and traveler Alexis De Toqueville highlighted the centrality of the civic association to American self-government “Nothing...is more deserving of our attention than the intellectual and moral associations of America."  Furthermore, he believed that such associations were necessary for political action and social improvement because equality across individuals had rendered large scale action by individuals alone impossible: "If men are to remain civilized...the art of associating together must grow and improve in the same ratio in which the equality of conditions is increased."[^Toqueville]
+In his classic summary of his observations of *Democracy in America*, French aristocrat and traveler Alexis De Toqueville highlighted the centrality of the civic association to American self-government “Nothing...is more deserving of our attention than the intellectual and moral associations of America."  Furthermore, he believed that such associations were necessary for political action and social improvement because equality across individuals had rendered large scale action by individuals alone impossible: "If men are to remain civilized...the art of associating together must grow and improve in the same ratio in which the equality of conditions is increased."[^Tocqueville]
 
 No individual has ever, alone, made political, social or economic change.  Collective efforts, through political parties, civic associations, labor unions and businesses, is always necessary.  For ⿻, these and other less formal social groupings are just as fundamental as individuals are to the social fabric.  In this sense, associations are the Yin to the Yang of personhood in the most foundational rights and for the same reason are the scourge of tyrants. Again to quote De Toqueville, "No defect of the human heart suits (despotism) better than egoism; a tyrant is relaxed enough to forgive his subjects for failing to love him, provided that they do not love one another."  Only by facilitating and protecting the capacity to form novel associations with meaningful agency can we hope for freedom, self-government and diversity.
 

diff --git a/scripts/make-book-zh-tw.pl b/scripts/make-book-zh-tw.pl
@@ -61,7 +61,7 @@ sub write_file {
     $c =~ s/^( +|&nbsp;)+//mg;
     $c =~ s,(<(br|img)\b[^>]*)(?<!/)>,$1 />,g;
     $c =~ s,<img\b[^>]*src="([^"]+)"[^>]*>,![$1]($1){ width=100% },g;
-    $c =~ s,(\[\^)(\d+\]),$1$basename$2,g;
+    $c =~ s,(\[\^)(.*?\]),$1$basename-$2,g;
     $c =~ s,(^\s*\|?\s*(?:原文|作者|譯者)：.*\n)(^\s*\|?\s*(?:原文|作者|譯者)：.*\n|^\s*\n|^---\n)+,\n,mg;
     $all .= "$c\n\n";
 }

diff --git a/scripts/make-book.pl b/scripts/make-book.pl
@@ -60,6 +60,7 @@ sub write_file {
     Encode::_utf8_on($c);
     $c =~ s/# /## $basename /;
     $c =~ s/^( +|&nbsp;)+//mg;
+    $c =~ s,(\[\^)(.*?\]),$1$basename-$2,g;
     $c =~ s,<img\b[^>]*src="([^"]+)"[^>]*>,![$1]($1){ width=100% },g;
     $all .= "$c\n\n";
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     ---
-    In his classic summary of his observations of *Democracy in America*, French aristocrat and traveler Alexis De Toqueville highlighted the centrality of the civic association to American self-government “Nothing...is more deserving of our attention than the intellectual and moral associations of America."  Furthermore, he believed that such associations were necessary for political action and social improvement because equality across individuals had rendered large scale action by individuals alone impossible: "If men are to remain civilized...the art of associating together must grow and improve in the same ratio in which the equality of conditions is increased."[^Toqueville]
+    In his classic summary of his observations of *Democracy in America*, French aristocrat and traveler Alexis De Toqueville highlighted the centrality of the civic association to American self-government “Nothing...is more deserving of our attention than the intellectual and moral associations of America."  Furthermore, he believed that such associations were necessary for political action and social improvement because equality across individuals had rendered large scale action by individuals alone impossible: "If men are to remain civilized...the art of associating together must grow and improve in the same ratio in which the equality of conditions is increased."[^Tocqueville]
     No individual has ever, alone, made political, social or economic change.  Collective efforts, through political parties, civic associations, labor unions and businesses, is always necessary.  For ⿻, these and other less formal social groupings are just as fundamental as individuals are to the social fabric.  In this sense, associations are the Yin to the Yang of personhood in the most foundational rights and for the same reason are the scourge of tyrants. Again to quote De Toqueville, "No defect of the human heart suits (despotism) better than egoism; a tyrant is relaxed enough to forgive his subjects for failing to love him, provided that they do not love one another."  Only by facilitating and protecting the capacity to form novel associations with meaningful agency can we hope for freedom, self-government and diversity.
@@ Expand Down @@