# HG changeset patch
# User Jonathan Kew <jkew@mozilla.com>
# Date 1557765344 0
#      Mon May 13 16:35:44 2019 +0000
# Node ID a811c910cfd3527d20556d09fca7dafc4003bc4d
# Parent  5a20e917ee2d3ac8c01ff1be2ffde204631b9ad9
Bug 1550532 - Avoid auto-hyphenating capitalized words, except for German. r=emilio,mats

This affects a number of our existing reftests, so we'll need to update those
to not expect auto-hyphenation of a sentence-initial (capitalized) word.

(Hyphenation behavior is not sufficiently well-specified for this to be tested
at the WPT level, so we just use Gecko-specific reftests.)

Differential Revision: https://phabricator.services.mozilla.com/D30912

diff --git a/intl/hyphenation/glue/nsHyphenationManager.cpp b/intl/hyphenation/glue/nsHyphenationManager.cpp
--- a/intl/hyphenation/glue/nsHyphenationManager.cpp
+++ b/intl/hyphenation/glue/nsHyphenationManager.cpp
@@ -74,16 +74,19 @@ nsHyphenationManager::~nsHyphenationMana
 
 already_AddRefed<nsHyphenator> nsHyphenationManager::GetHyphenator(
     nsIAtom* aLocale) {
   RefPtr<nsHyphenator> hyph;
   mHyphenators.Get(aLocale, getter_AddRefs(hyph));
   if (hyph) {
     return hyph.forget();
   }
+  nsAutoCString hyphCapPref("intl.hyphenate-capitalized.");
+  hyphCapPref.Append(nsAtomCString(aLocale));
+  bool hyphenateCapitalized = Preferences::GetBool(hyphCapPref.get());
   nsCOMPtr<nsIURI> uri = mPatternFiles.Get(aLocale);
   if (!uri) {
     nsCOMPtr<nsIAtom> alias = mHyphAliases.Get(aLocale);
     if (alias) {
       mHyphenators.Get(alias, getter_AddRefs(hyph));
       if (hyph) {
         return hyph.forget();
       }
@@ -105,17 +108,17 @@ already_AddRefed<nsHyphenator> nsHyphena
         localeStr.ReplaceLiteral(i, localeStr.Length() - i, "-*");
         nsCOMPtr<nsIAtom> fuzzyLocale = NS_Atomize(localeStr);
         return GetHyphenator(fuzzyLocale);
       } else {
         return nullptr;
       }
     }
   }
-  hyph = new nsHyphenator(uri);
+  hyph = new nsHyphenator(uri, hyphenateCapitalized);
   if (hyph->IsValid()) {
     mHyphenators.Put(aLocale, hyph);
     return hyph.forget();
   }
 #ifdef DEBUG
   nsCString msg("failed to load patterns from ");
   msg += uri->GetSpecOrDefault();
   NS_WARNING(msg.get());
diff --git a/intl/hyphenation/glue/nsHyphenator.cpp b/intl/hyphenation/glue/nsHyphenator.cpp
--- a/intl/hyphenation/glue/nsHyphenator.cpp
+++ b/intl/hyphenation/glue/nsHyphenator.cpp
@@ -6,17 +6,18 @@
 #include "nsHyphenator.h"
 #include "nsIFile.h"
 #include "nsUTF8Utils.h"
 #include "nsUnicodeProperties.h"
 #include "nsIURI.h"
 
 #include "hyphen.h"
 
-nsHyphenator::nsHyphenator(nsIURI* aURI) : mDict(nullptr) {
+nsHyphenator::nsHyphenator(nsIURI* aURI, bool aHyphenateCapitalized)
+    : mDict(nullptr), mHyphenateCapitalized(aHyphenateCapitalized) {
   nsCString uriSpec;
   nsresult rv = aURI->GetSpec(uriSpec);
   if (NS_FAILED(rv)) {
     return;
   }
   mDict = hnj_hyphen_load(uriSpec.get());
 #ifdef DEBUG
   if (mDict) {
@@ -65,84 +66,100 @@ nsresult nsHyphenator::Hyphenate(const n
       }
       wordLimit = i + chLen;
       if (i + chLen < aString.Length()) {
         continue;
       }
     }
 
     if (inWord) {
-      // Convert the word to utf-8 for libhyphen, lowercasing it as we go
-      // so that it will match the (lowercased) patterns (bug 1105644).
-      nsAutoCString utf8;
-      const char16_t* const begin = aString.BeginReading();
-      const char16_t* cur = begin + wordStart;
-      const char16_t* end = begin + wordLimit;
-      while (cur < end) {
-        uint32_t ch = *cur++;
-
-        if (NS_IS_HIGH_SURROGATE(ch)) {
-          if (cur < end && NS_IS_LOW_SURROGATE(*cur)) {
-            ch = SURROGATE_TO_UCS4(ch, *cur++);
-          } else {
-            ch = 0xfffd;  // unpaired surrogate, treat as REPLACEMENT CHAR
-          }
-        } else if (NS_IS_LOW_SURROGATE(ch)) {
-          ch = 0xfffd;  // unpaired surrogate
-        }
-
-        // XXX What about language-specific casing? Consider Turkish I/i...
-        // In practice, it looks like the current patterns will not be
-        // affected by this, as they treat dotted and undotted i similarly.
-        ch = ToLowerCase(ch);
-
-        if (ch < 0x80) {  // U+0000 - U+007F
-          utf8.Append(ch);
-        } else if (ch < 0x0800) {  // U+0100 - U+07FF
-          utf8.Append(0xC0 | (ch >> 6));
-          utf8.Append(0x80 | (0x003F & ch));
-        } else if (ch < 0x10000) {  // U+0800 - U+D7FF,U+E000 - U+FFFF
-          utf8.Append(0xE0 | (ch >> 12));
-          utf8.Append(0x80 | (0x003F & (ch >> 6)));
-          utf8.Append(0x80 | (0x003F & ch));
-        } else {
-          utf8.Append(0xF0 | (ch >> 18));
-          utf8.Append(0x80 | (0x003F & (ch >> 12)));
-          utf8.Append(0x80 | (0x003F & (ch >> 6)));
-          utf8.Append(0x80 | (0x003F & ch));
-        }
-      }
-
-      AutoTArray<char, 200> utf8hyphens;
-      utf8hyphens.SetLength(utf8.Length() + 5);
-      char** rep = nullptr;
-      int* pos = nullptr;
-      int* cut = nullptr;
-      int err = hnj_hyphen_hyphenate2((HyphenDict*)mDict, utf8.BeginReading(),
-                                      utf8.Length(), utf8hyphens.Elements(),
-                                      nullptr, &rep, &pos, &cut);
-      if (!err) {
-        // Surprisingly, hnj_hyphen_hyphenate2 converts the 'hyphens' buffer
-        // from utf8 code unit indexing (which would match the utf8 input
-        // string directly) to Unicode character indexing.
-        // We then need to convert this to utf16 code unit offsets for Gecko.
-        const char* hyphPtr = utf8hyphens.Elements();
-        const char16_t* cur = begin + wordStart;
-        const char16_t* end = begin + wordLimit;
-        while (cur < end) {
-          if (*hyphPtr & 0x01) {
-            aHyphens[cur - begin] = true;
-          }
-          cur++;
-          if (cur < end && NS_IS_LOW_SURROGATE(*cur) &&
-              NS_IS_HIGH_SURROGATE(*(cur - 1))) {
-            cur++;
-          }
-          hyphPtr++;
-        }
-      }
+      HyphenateWord(aString, wordStart, wordLimit, aHyphens);
+      inWord = false;
     }
-
-    inWord = false;
   }
 
   return NS_OK;
 }
+
+void nsHyphenator::HyphenateWord(const nsAString& aString, uint32_t aStart,
+                                 uint32_t aLimit, nsTArray<bool>& aHyphens) {
+  // Convert word from aStart and aLimit in aString to utf-8 for libhyphen,
+  // lowercasing it as we go so that it will match the (lowercased) patterns
+  // (bug 1105644).
+  nsAutoCString utf8;
+  const char16_t* const begin = aString.BeginReading();
+  const char16_t* cur = begin + aStart;
+  const char16_t* end = begin + aLimit;
+  bool firstLetter = true;
+  while (cur < end) {
+    uint32_t ch = *cur++;
+
+    if (NS_IS_HIGH_SURROGATE(ch)) {
+      if (cur < end && NS_IS_LOW_SURROGATE(*cur)) {
+        ch = SURROGATE_TO_UCS4(ch, *cur++);
+      } else {
+        ch = 0xfffd;  // unpaired surrogate, treat as REPLACEMENT CHAR
+      }
+    } else if (NS_IS_LOW_SURROGATE(ch)) {
+      ch = 0xfffd;  // unpaired surrogate
+    }
+
+    // XXX What about language-specific casing? Consider Turkish I/i...
+    // In practice, it looks like the current patterns will not be
+    // affected by this, as they treat dotted and undotted i similarly.
+    uint32_t origCh = ch;
+    ch = ToLowerCase(ch);
+
+    // Avoid hyphenating capitalized words (bug 1550532) unless explicitly
+    // allowed by prefs for the language in use.
+    if (firstLetter) {
+      if (!mHyphenateCapitalized && ch != origCh) {
+        return;
+      }
+      firstLetter = false;
+    }
+
+    if (ch < 0x80) {  // U+0000 - U+007F
+      utf8.Append(ch);
+    } else if (ch < 0x0800) {  // U+0100 - U+07FF
+      utf8.Append(0xC0 | (ch >> 6));
+      utf8.Append(0x80 | (0x003F & ch));
+    } else if (ch < 0x10000) {  // U+0800 - U+D7FF,U+E000 - U+FFFF
+      utf8.Append(0xE0 | (ch >> 12));
+      utf8.Append(0x80 | (0x003F & (ch >> 6)));
+      utf8.Append(0x80 | (0x003F & ch));
+    } else {
+      utf8.Append(0xF0 | (ch >> 18));
+      utf8.Append(0x80 | (0x003F & (ch >> 12)));
+      utf8.Append(0x80 | (0x003F & (ch >> 6)));
+      utf8.Append(0x80 | (0x003F & ch));
+    }
+  }
+
+  AutoTArray<char, 200> utf8hyphens;
+  utf8hyphens.SetLength(utf8.Length() + 5);
+  char** rep = nullptr;
+  int* pos = nullptr;
+  int* cut = nullptr;
+  int err = hnj_hyphen_hyphenate2((HyphenDict*)mDict, utf8.BeginReading(),
+                                  utf8.Length(), utf8hyphens.Elements(),
+                                  nullptr, &rep, &pos, &cut);
+  if (!err) {
+    // Surprisingly, hnj_hyphen_hyphenate2 converts the 'hyphens' buffer
+    // from utf8 code unit indexing (which would match the utf8 input
+    // string directly) to Unicode character indexing.
+    // We then need to convert this to utf16 code unit offsets for Gecko.
+    const char* hyphPtr = utf8hyphens.Elements();
+    const char16_t* cur = begin + aStart;
+    const char16_t* end = begin + aLimit;
+    while (cur < end) {
+      if (*hyphPtr & 0x01) {
+        aHyphens[cur - begin] = true;
+      }
+      cur++;
+      if (cur < end && NS_IS_LOW_SURROGATE(*cur) &&
+          NS_IS_HIGH_SURROGATE(*(cur - 1))) {
+        cur++;
+      }
+      hyphPtr++;
+    }
+  }
+}
diff --git a/intl/hyphenation/glue/nsHyphenator.h b/intl/hyphenation/glue/nsHyphenator.h
--- a/intl/hyphenation/glue/nsHyphenator.h
+++ b/intl/hyphenation/glue/nsHyphenator.h
@@ -9,24 +9,27 @@
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsTArray.h"
 
 class nsIURI;
 
 class nsHyphenator {
  public:
-  explicit nsHyphenator(nsIURI* aURI);
+  nsHyphenator(nsIURI* aURI, bool aHyphenateCapitalized);
 
   NS_INLINE_DECL_REFCOUNTING(nsHyphenator)
 
   bool IsValid();
 
   nsresult Hyphenate(const nsAString& aText, nsTArray<bool>& aHyphens);
 
  private:
   ~nsHyphenator();
 
- protected:
+  void HyphenateWord(const nsAString& aString, uint32_t aStart,
+                     uint32_t aLimit, nsTArray<bool>& aHyphens);
+
   void* mDict;
+  bool mHyphenateCapitalized;
 };
 
 #endif  // nsHyphenator_h__
diff --git a/layout/reftests/text/auto-hyphenation-af-1-ref.html b/layout/reftests/text/auto-hyphenation-af-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-af-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-af-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="af">
-Al&shy;le mens&shy;li&shy;ke we&shy;sens word vry, met ge&shy;ly&shy;ke waar&shy;dig&shy;heid en reg&shy;te, ge&shy;bo&shy;re.
+Alle mens&shy;li&shy;ke we&shy;sens word vry, met ge&shy;ly&shy;ke waar&shy;dig&shy;heid en reg&shy;te, ge&shy;bo&shy;re.
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-bg-1-ref.html b/layout/reftests/text/auto-hyphenation-bg-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-bg-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-bg-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="bg">
-Всич&shy;ки хо&shy;ра се раж&shy;дат сво&shy;бод&shy;ни и рав&shy;ни по дос&shy;тойн&shy;с&shy;т&shy;во и пра&shy;ва.
+Всички хо&shy;ра се раж&shy;дат сво&shy;бод&shy;ни и рав&shy;ни по дос&shy;тойн&shy;с&shy;т&shy;во и пра&shy;ва.
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-cy-1-ref.html b/layout/reftests/text/auto-hyphenation-cy-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-cy-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-cy-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="cy">
-Gen&shy;ir pawb yn rhydd ac yn gyd&shy;radd â'i gil&shy;ydd mewn urdd&shy;as a hawl&shy;iau.
+Genir pawb yn rhydd ac yn gyd&shy;radd â'i gil&shy;ydd mewn urdd&shy;as a hawl&shy;iau.
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-da-1-ref.html b/layout/reftests/text/auto-hyphenation-da-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-da-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-da-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="da">
-Al&shy;le men&shy;ne&shy;sker er født frie og li&shy;ge i vær&shy;dig&shy;hed og ret&shy;tig&shy;he&shy;der.
+Alle men&shy;ne&shy;sker er født frie og li&shy;ge i vær&shy;dig&shy;hed og ret&shy;tig&shy;he&shy;der.
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-es-1-ref.html b/layout/reftests/text/auto-hyphenation-es-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-es-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-es-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="es">
-To&shy;dos los se&shy;res hu&shy;ma&shy;nos na&shy;cen li&shy;bres e igua&shy;les en dig&shy;ni&shy;dad y de&shy;re&shy;chos
+Todos los se&shy;res hu&shy;ma&shy;nos na&shy;cen li&shy;bres e igua&shy;les en dig&shy;ni&shy;dad y de&shy;re&shy;chos
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-fi-1-ref.html b/layout/reftests/text/auto-hyphenation-fi-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-fi-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-fi-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="fi">
-Kaik&shy;ki ih&shy;mi&shy;set syn&shy;ty&shy;vät va&shy;pai&shy;na ja ta&shy;sa&shy;ver&shy;tai&shy;si&shy;na ar&shy;vol&shy;taan ja oi&shy;keuk&shy;sil&shy;taan.
+Kaikki ih&shy;mi&shy;set syn&shy;ty&shy;vät va&shy;pai&shy;na ja ta&shy;sa&shy;ver&shy;tai&shy;si&shy;na ar&shy;vol&shy;taan ja oi&shy;keuk&shy;sil&shy;taan.
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-gl-1-ref.html b/layout/reftests/text/auto-hyphenation-gl-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-gl-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-gl-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="gl">
-Tó&shy;do&shy;los se&shy;res hu&shy;ma&shy;nos na&shy;cen li&shy;bres e iguais en dig&shy;ni&shy;da&shy;de e de&shy;rei&shy;tos
+Tódolos se&shy;res hu&shy;ma&shy;nos na&shy;cen li&shy;bres e iguais en dig&shy;ni&shy;da&shy;de e de&shy;rei&shy;tos
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-hu-1-ref.html b/layout/reftests/text/auto-hyphenation-hu-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-hu-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-hu-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="hu">
-Min&shy;den em&shy;be&shy;ri lény sza&shy;ba&shy;don szü&shy;le&shy;tik és egyen&shy;lő mél&shy;tó&shy;sá&shy;ga és jo&shy;ga van.
+Minden em&shy;be&shy;ri lény sza&shy;ba&shy;don szü&shy;le&shy;tik és egyen&shy;lő mél&shy;tó&shy;sá&shy;ga és jo&shy;ga van.
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-ia-1-ref.html b/layout/reftests/text/auto-hyphenation-ia-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-ia-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-ia-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="ia">
-To&shy;te le es&shy;se&shy;res hu&shy;man na&shy;sce li&shy;be&shy;re e equal in dig&shy;ni&shy;ta&shy;te e in de&shy;rec&shy;tos
+Tote le es&shy;se&shy;res hu&shy;man na&shy;sce li&shy;be&shy;re e equal in dig&shy;ni&shy;ta&shy;te e in de&shy;rec&shy;tos
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-it-1-ref.html b/layout/reftests/text/auto-hyphenation-it-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-it-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-it-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="it">
-Tut&shy;ti gli es&shy;se&shy;ri uma&shy;ni na&shy;sco&shy;no li&shy;be&shy;ri ed egua&shy;li in di&shy;gni&shy;tà e di&shy;rit&shy;ti.
+Tutti gli es&shy;se&shy;ri uma&shy;ni na&shy;sco&shy;no li&shy;be&shy;ri ed egua&shy;li in di&shy;gni&shy;tà e di&shy;rit&shy;ti.
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-kmr-1-ref.html b/layout/reftests/text/auto-hyphenation-kmr-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-kmr-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-kmr-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="kmr">
-He&shy;mû mi&shy;rov azad û di we&shy;qar û ma&shy;fan de we&shy;k&shy;hev tên din&shy;ya&shy;yê
+Hemû mi&shy;rov azad û di we&shy;qar û ma&shy;fan de we&shy;k&shy;hev tên din&shy;ya&shy;yê
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-la-1-ref.html b/layout/reftests/text/auto-hyphenation-la-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-la-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-la-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="la">
-Om&shy;nes ho&shy;mi&shy;nes di&shy;gni&shy;ta&shy;te et iu&shy;re li&shy;be&shy;ri et pa&shy;res na&shy;scun&shy;tur
+Omnes ho&shy;mi&shy;nes di&shy;gni&shy;ta&shy;te et iu&shy;re li&shy;be&shy;ri et pa&shy;res na&shy;scun&shy;tur
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-lt-1-ref.html b/layout/reftests/text/auto-hyphenation-lt-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-lt-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-lt-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="lt">
-Vi&shy;si žmo&shy;nės gims&shy;ta lais&shy;vi ir ly&shy;gūs sa&shy;vo oru&shy;mu ir tei&shy;sė&shy;mis.
+Visi žmo&shy;nės gims&shy;ta lais&shy;vi ir ly&shy;gūs sa&shy;vo oru&shy;mu ir tei&shy;sė&shy;mis.
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-nl-1-ref.html b/layout/reftests/text/auto-hyphenation-nl-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-nl-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-nl-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="nl">
-Al&shy;le men&shy;sen wor&shy;den vrij en ge&shy;lijk in waar&shy;dig&shy;heid en rech&shy;ten ge&shy;bo&shy;ren
+Alle men&shy;sen wor&shy;den vrij en ge&shy;lijk in waar&shy;dig&shy;heid en rech&shy;ten ge&shy;bo&shy;ren
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-pl-1-ref.html b/layout/reftests/text/auto-hyphenation-pl-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-pl-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-pl-1-ref.html
@@ -6,18 +6,17 @@
 <style>
 body {
   font-family: "Times New Roman", serif; /* prefer TNR to Times (default) on OS X... */
   font-feature-settings: 'kern' off;
 }
 </style>
 </head>
 <body>
-<div style="white-space:pre-wrap;">Uni-
-kod
+<div style="white-space:pre-wrap;">Unikod
 przy-
 pi-
 su-
 je
 uni-
 kal-
 ny
 nu-
diff --git a/layout/reftests/text/auto-hyphenation-pt-1-ref.html b/layout/reftests/text/auto-hyphenation-pt-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-pt-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-pt-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="pt">
-To&shy;dos os se&shy;res hu&shy;ma&shy;nos nas&shy;cem li&shy;vres e iguais em dig&shy;ni&shy;da&shy;de e em di&shy;rei&shy;tos
+Todos os se&shy;res hu&shy;ma&shy;nos nas&shy;cem li&shy;vres e iguais em dig&shy;ni&shy;da&shy;de e em di&shy;rei&shy;tos
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-sv-1-ref.html b/layout/reftests/text/auto-hyphenation-sv-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-sv-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-sv-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="sv">
-Al&shy;la män&shy;ni&shy;skor äro föd&shy;da fria och li&shy;ka i vär&shy;de och rät&shy;tig&shy;he&shy;ter
+Alla män&shy;ni&shy;skor äro föd&shy;da fria och li&shy;ka i vär&shy;de och rät&shy;tig&shy;he&shy;ter
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/auto-hyphenation-tr-1-ref.html b/layout/reftests/text/auto-hyphenation-tr-1-ref.html
--- a/layout/reftests/text/auto-hyphenation-tr-1-ref.html
+++ b/layout/reftests/text/auto-hyphenation-tr-1-ref.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <div style="width:1em; hyphens:manual;" lang="tr">
-Bü&shy;tün in&shy;san&shy;lar hür, hay&shy;si&shy;yet ve hak&shy;lar ba&shy;kı&shy;mın&shy;dan eşit do&shy;ğar&shy;lar.
+Bütün in&shy;san&shy;lar hür, hay&shy;si&shy;yet ve hak&shy;lar ba&shy;kı&shy;mın&shy;dan eşit do&shy;ğar&shy;lar.
 </div>
 </body>
 </html>
diff --git a/layout/reftests/text/hyphenation-control-3-ref.html b/layout/reftests/text/hyphenation-control-3-ref.html
--- a/layout/reftests/text/hyphenation-control-3-ref.html
+++ b/layout/reftests/text/hyphenation-control-3-ref.html
@@ -6,12 +6,12 @@ code {
   display:block;
   hyphens:manual;
   border: 1px solid black;
 }
 </style>
 </head>
 <body lang="en-us">
 <code style="width:100ch;">
-ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTU-<br />VWXYZsupercalifragilisticexpialidocious-<br />ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ
+abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstu-<br />vwxyzsupercalifragilisticexpialidocious-<br />abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
 </code>
 </body>
 </html>
diff --git a/layout/reftests/text/hyphenation-control-3.html b/layout/reftests/text/hyphenation-control-3.html
--- a/layout/reftests/text/hyphenation-control-3.html
+++ b/layout/reftests/text/hyphenation-control-3.html
@@ -10,12 +10,12 @@ code {
 </style>
 </head>
 <body lang="en-us">
 <!--
   Test checks that automatic hyphenation opportunities should honor
   manual hyphenation opportunities even if they are within an extreme long word.
 -->
 <code style="width:100ch;">
-ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZsuper&shy;cali&shy;fragi&shy;listic&shy;expiali&shy;docious&shy;ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ
+abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzsuper&shy;cali&shy;fragi&shy;listic&shy;expiali&shy;docious&shy;abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
 </code>
 </body>
 </html>
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2480,16 +2480,21 @@ pref("intl.hyphenation-alias.bs-*", "sh"
 
 // Norwegian has two forms, Bokmål and Nynorsk, with "no" as a macrolanguage encompassing both.
 // For "no", we'll alias to "nb" (Bokmål) as that is the more widely used written form.
 pref("intl.hyphenation-alias.no", "nb");
 pref("intl.hyphenation-alias.no-*", "nb");
 pref("intl.hyphenation-alias.nb-*", "nb");
 pref("intl.hyphenation-alias.nn-*", "nn");
 
+// In German, we allow hyphenation of capitalized words; otherwise not.
+pref("intl.hyphenate-capitalized.de-1996", true);
+pref("intl.hyphenate-capitalized.de-1901", true);
+pref("intl.hyphenate-capitalized.de-CH", true);
+
 // All prefs of default font should be "auto".
 pref("font.name.serif.ar", "");
 pref("font.name.sans-serif.ar", "");
 pref("font.name.monospace.ar", "");
 pref("font.name.cursive.ar", "");
 
 pref("font.name.serif.el", "");
 pref("font.name.sans-serif.el", "");