6941442205

Committed 21 Nov 2023 08:56AM UTC coverage: 63.58% (+1.3%) from 62.266%

Build # 6941442205

Build Type

Pull #1904

github

Committed by

web-flow

Commit Message

Merge pull request #1891 from sile-typesetter/ot-tate

Pull Request Pull Request #1904: Merge develop into master (commit to next release being breaking)

Run Details

67 of 198 new or added lines in 20 files covered. (33.84%)

171 existing lines in 13 files now uncovered.

9907 of 15582 relevant lines covered (63.58%)

6710.82 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/languages/fr.lua

-- French language rules

local computeSpaces = function()
  -- Computes:
  --  -  regular inter-word space,
  --  -  half inter-word fixed space,
  --  -  "guillemet space", as defined in LaTeX's babel-french which is based
  --     on Thierry Bouche's recommendations,
  --  These should be usual for France and Canada. The Swiss may prefer a thin
  --  space for guillemets, that's why we are having settings hereafter.
  local enlargement = SILE.settings:get("shaper.spaceenlargementfactor")
  local stretch = SILE.settings:get("shaper.spacestretchfactor")
  local shrink = SILE.settings:get("shaper.spaceshrinkfactor")
  return {
    colonspace = SILE.length(enlargement.."spc plus "..stretch.."spc minus "..shrink.."spc"),
    thinspace = SILE.length((0.5 * enlargement).."spc"),
    guillspace = SILE.length((0.8 * enlargement).."spc plus "..(0.3 * stretch).."spc minus "..(0.8 * shrink).."spc")
  }
end

local spaces = computeSpaces()
-- NOTE: We are only doing it at load time. We don't expect the shaper settings to be often
-- changed arbitrarily _after_ having selected a language...

SILE.settings:declare({
  parameter = "languages.fr.colonspace",
  type = "kern",
  default = SILE.nodefactory.kern(spaces.colonspace),
  help = "The amount of space before a colon, theoretically a non-breakable, shrinkable, stretchable inter-word space"
})

SILE.settings:declare({
  parameter = "languages.fr.thinspace",
  type = "kern",
  default = SILE.nodefactory.kern(spaces.thinspace),
  help = "The amount of space before high punctuations, theoretically a fixed, non-breakable space, around half the inter-word space"
})

SILE.settings:declare({
  parameter = "languages.fr.guillspace",
  type = "kern",
  default = SILE.nodefactory.kern(spaces.guillspace),
  help = "The amount of space applying to guillemets, theoretically smaller than a non-breakable inter-word space, with reduced stretchability"
})

SILE.settings:declare({
  parameter = "languages.fr.debugspace",
  type = "boolean",
  default = false,
  help = "If switched to true, uses large spaces instead of the regular punctuation ones"
})

local getSpaceGlue = function(options, parameter)
  local sg
  if SILE.settings:get("languages.fr.debugspace") then
    sg = SILE.nodefactory.kern("5spc")
  else
    sg = SILE.settings:get(parameter)
  end
  -- Return the absolute (kern) length of the specified spacing parameter
  -- with a particular set of font options.
  -- As for SILE.shapers.base.measureSpace(), which has the same type of
  -- logic, caching this doesn't seem to have any significant speedup.
  SILE.settings:temporarily(function ()
    SILE.settings:set("font.size", options.size)
    SILE.settings:set("font.family", options.family)
    SILE.settings:set("font.filename", options.filename)
    sg = sg:absolute()
  end)
  -- Track a subtype on that kern:
  -- See automated italic correction at the typesetter level.
  sg.subtype = "punctspace"
  return sg
end

SILE.nodeMakers.fr = pl.class(SILE.nodeMakers.unicode)

-- Unfortunately, there is nothing in the Unicode properties
-- database which distinguishes between high and low punctuation, etc.
-- But in a way that's precisely why we can't just rely on Unicode
-- for everything and need our language-specific typesetting
-- processors.
SILE.nodeMakers.fr.colonPunctuations = { ":" }
SILE.nodeMakers.fr.openingQuotes = { "«", "‹" }
SILE.nodeMakers.fr.closingQuotes = { "»", "›" }
-- There's catch below: the shaper may have already processed common ligatures (!!, ?!, !?)
-- as a single item...
SILE.nodeMakers.fr.highPunctuations = { ";", "!", "?", "!!", "?!", "!?" }
-- High punctuations have some (kern) space before them... except in some cases!
-- By the books, they have it "after a letter or digit", at least. After a closing
-- punctuation, too, seems usual.
-- Otherwise, one shall have no space inside e.g. (?), ?!, [!], …?, !!! etc.
-- As a simplication, we reverse the rule and define after which characters the space
-- shall not be added. This is by no mean perfect, I couldn't find an explicit list
-- of exceptions. French typography is a delicate beast.
SILE.nodeMakers.fr.spaceExceptions = { "!", "?", ":", ".", "…", "(", "[", "{", "<", "«", "‹", "“", "‘", "?!", "!!", "!?" }

-- overriden properties from parent class
SILE.nodeMakers.fr.isQuoteType = { qu = true } -- split tokens at apostrophes &c.

-- methods defined in this class

function SILE.nodeMakers.fr.isIn (_, set, text)
  for _, v in ipairs(set) do
    if v == text then
      return true
    end
  end
  return false
end

function SILE.nodeMakers.fr:isOpeningQuote (text)
  return self:isIn(self.openingQuotes, text)
end

function SILE.nodeMakers.fr:isClosingQuote (text)
  return self:isIn(self.closingQuotes, text)
end

function SILE.nodeMakers.fr:isColonPunctuation (text)
  return self:isIn(self.colonPunctuations, text)
end

function SILE.nodeMakers.fr:isHighPunctuation (text)
  return self:isIn(self.highPunctuations, text)
end

function SILE.nodeMakers.fr:isSpaceException (text)
  return self:isIn(self.spaceExceptions, text)
end

function SILE.nodeMakers.fr:isPrevSpaceException ()
  return self.i > 1 and self:isSpaceException(self.items[self.i-1].text) or false
end

function SILE.nodeMakers.fr:makeUnbreakableSpace (parameter)
  self:makeToken()
  self.lastnode = "glue"
  coroutine.yield(getSpaceGlue(self.options, parameter))
end

function SILE.nodeMakers.fr:handleSpaceBefore (item)
  if self:isHighPunctuation(item.text) and not self:isPrevSpaceException() then
    self:makeUnbreakableSpace("languages.fr.thinspace")
    self:makeToken()
    self:addToken(item.text, item)
    return true
  end
  if self:isColonPunctuation(item.text) and not self:isPrevSpaceException() then
    self:makeUnbreakableSpace("languages.fr.colonspace")
    self:makeToken()
    self:addToken(item.text, item)
    return true
  end
  if self:isClosingQuote(item.text) then
    self:makeUnbreakableSpace("languages.fr.guillspace")
    self:makeToken()
    self:addToken(item.text, item)
    return true
  end
  return false
end

function SILE.nodeMakers.fr:handleSpaceAfter (item)
  if self:isOpeningQuote(item.text) then
    self:addToken(item.text, item)
    self:makeUnbreakableSpace("languages.fr.guillspace")
    self:makeToken()
    return true
  end
  return false
end

function SILE.nodeMakers.fr:mustRemove (i, items)
  -- Clear "manual" spaces we do not want, so that later we only have to
  -- insert the relevant kerns.
  local curr = items[i].text
  if self:isSpace(curr) then
    if i < #items then
      local next = items[i+1].text
      if self:isSpace(next)
          or self:isHighPunctuation(next)
          or self:isColonPunctuation(next)
          or self:isClosingQuote(next) then
        return true
      end
    end
    if i > 1 then
      local prev= items[i-1].text
      if self:isOpeningQuote(prev) then
        return true
      end
    end
  end
  return false
end

-- overriden methods from parent class

function SILE.nodeMakers.fr:dealWith (item)
  if self:handleSpaceBefore(item) then return end
  if self:handleSpaceAfter(item) then return end
  self._base.dealWith(self, item)
end

function SILE.nodeMakers.fr:handleWordBreak (item)
  if self:handleSpaceBefore(item) then return end
  if self:handleSpaceAfter(item) then return end
  self._base.handleWordBreak(self, item)
end

function SILE.nodeMakers.fr:handleLineBreak (item, subtype)
  if self:isSpace(item.text) then
    self:handleWordBreak(item)
    return
  end
  if self:handleSpaceBefore(item) then return end
  if self:handleSpaceAfter(item) then return end

  self._base.handleLineBreak(self, item, subtype)
end

function SILE.nodeMakers.fr:iterator (items)
  -- We start by cleaning up the input once for all.
  local cleanItems = {}
  local removed = 0
  for k = 1, #items do
    if self:mustRemove(k, items) then
      removed = removed + 1
    else
      items[k].index = items[k].index - removed -- index has changed due to removals
      table.insert(cleanItems, items[k])
    end
  end
  return self._base.iterator(self, cleanItems)
end

SILE.hyphenator.languages["fr"] = {}
SILE.hyphenator.languages["fr"].patterns =
{
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----*
"2'2",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----a
".a4",
"'a4",
".â4",
"'â4",
"ab2h", -- df-bg 1998/02/07 for abhorrer
".ab3réa",
"'ab3réa",
"ad2h", -- df-bg 1998/02/07 for adhèsion & co
"a1è2dre",
".ae3s4ch",
"'ae3s4ch",
"1alcool",
"'2alcool",
"a2l1algi",
".amino1a2c",
"'amino1a2c",
".ana3s4tr",
"'ana3s4tr",
"1a2nesthési",
"'2a2nesthési",
".anti1a2",
"'anti1a2",
".anti1e2",
"'anti1e2",
".anti1é2",
".anti2enne",
"'anti2enne",
"'anti1é2",
".anti1s2",
"'anti1s2",
".apo2s3ta",
"'apo2s3ta",
"apo2s3tr",
"archi1é2pis",
".as2ta",
"'as2ta",
"a2s3tro",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----b
"1ba",
"1bâ",
".bai2se3main", -- hyphen disappeared from french  5/2/94
"1be",
"1bé",
"1bè",
"1bê",
"4be.",
"4bes.",
"2bent.", -- mute syllable: tombent (df) 22/02/94
"1bi",
"1bî",
".bi1a2c",
".bi1a2t", -- like .tri1a2t for tri-athlon bg 12/27/93
".bi1au",
".bio1a2",
".bi2s1a2",
".bi1u2",
"1b2l",
"4ble.",
"4bles.",
"2blent.", -- mute syllable: troublent (df) 28/02/94
"1bo",
"1bô",
"1b2r",
"4bre.",
"4bres.",
"2brent.", -- mute syllable: palabrent (df) 28/02/94
"1bu",
"1bû",
"1by",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----c
"1ç",
"1ca",
"1câ",
"ca3ou3t2", -- for caoutchou... added 3/1/94 df-bg
"1ce",
"1cé",
"1cè",
"1cê",
"4ce.",
"4ces.",
-- words ending with -cent (df) 22/02/94
"2cent.",
"ja3cent.",
"ac3cent.",
"é3cent.",
"munifi3cent.",
"réti3cent.",
"privatdo3cent.",
"inno3cent.",
"es3cent.",
"acquies4cent.",
"is3cent.",
"immis4cent.",
--
".ch4",
"1c2h",
"4ch.",
"2chb",
"4che.",
"4ches.",
"2chent.", -- mute syllable: touchent (df) 22/02/94
".chè2vre3feuille", -- hyphen disappeared from french 5/2/94
"2chg",
"ch2l",
"4chle.",
"4chles.",
"chlo2r3a2c",
"chlo2r3é2t",
"2chm",
"2chn",
"2chp",
"ch2r",
"4chre.",
"4chres.",
"2chs",
"2cht",
"2chw",
"1ci",
"1cî",
".ci2s1alp",
"1c2k",
"4ck.",
"2ckb",
"4cke.",
"4ckes.",
"2ckent.", -- mute syllable: stockent (df) 22/02/94
"2ckf",
"2ckg",
"2ck3h",
"2ckp",
"2cks",
"2ckt",
"1c2l",
"4cle.",
"4cles.",
"2clent.", -- mute syllable: encerclent (df) 28/02/94
"1co",
"1cô",
"co1acc",
"co1acq",
"co1a2d",
"co1ap",
"co1ar",
"co1assoc",
"co1assur",
"co1au",
"co1ax",
"1cœ",
"co1é2",
"co1ef",
"co1en",
"co1ex",
".con4",  -- missing from nb list
".cons4", -- missing from nb list
".contre1s2c",
".contre3maître", -- hyphen disappeared from french 5/2/94
"co2nurb",
".co1o2",
".co2o3lie",
"1c2r",
"4cre.",
"4cres.",
"2crent.", -- mute syllable: massacrent (df) 28/02/94
"1cu",
"1cû",
"1cy",
".cul4", -- -- as .con4 .cons4 (march 92)
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----d
"1d'",
"1da",
"1dâ",
".dacryo1a2",
"d1d2h",
"1de",
"1dé",
"1dè",
"1dê",
"4de.",
"4des.",
-- words ending with -dent (df) 22/02/94
"2dent.",
"déca3dent.",
"é3dent.",
"cci3dent.",
"inci3dent.",
"confi3dent.",
"tri3dent.",
"dissi3dent.",
"chien3dent.",
".ar3dent.",
"impu3dent.",
"pru3dent.",
".dé1a2",
".dé1io",
".dé1o2",
".dé2s", -- originaly in JD file
-- .dé2s1a2 removed 09/17/92 because wrong for the
--  original JD 500 words test
".dé3s2a3cr",
".dés2a3m", -- .dés2a2mi introduced 09/17/92 bec. i
-- can't see why désamidonner ran in JD.
-- Moved to .dés2a3m df 12/27/93.
".dé3s2a3tell",
".dé3s2astr",
".dé3s2c", -- 1 moved 3 due to .dé2s 09/17/92
--.dé2s1e2 removed 09/17/92 because wrong for the
-- original JD 500 words test
".dé2s1é2",
".dé3s2é3gr",
".dé3s2ensib",
".dé3s2ert",
".dé3s2exu",
--.dé2s3h removed 09/17/92 because wrong for the
-- original JD 500 words test
".dé2s1i2",
".dé3s2i3d",
".dé3s2i3gn",
".dé3s2i3li",
".dé3s2i3nen",
".dé3s2invo",
".dé3s2i3r",
".dé3s2ist",
--.dé2s1o2 removed 09/17/92 because wrong for the
-- original JD 500 words test
".dé3s2o3dé",
".dé2s1œ",
".dé3s2o3l",
".dé3s2o3pil",
".dé3s2orm",
".dé3s2orp",
".dé3s2oufr",
".dé3s2p", -- 1 moved 3 due to .dé2s 09/17/92
".dé3s2t", -- 1 moved 3 due to .dé2s 09/17/92
".dé2s1u2n",
"3d2hal",
"3d2houd",
"1di",
"1dî",
"di2s3cop",
".di1a2cé",
".di1a2cid",
".di1ald",
".di1a2mi",
".di1a2tom",
".di1e2n",
".di2s3h",
"2dlent.", -- mute syllable: jodlent (df) 28/02/94
"1do",
"1dô",
"1d2r",
"4dre.",
"4dres.",
"2drent.", -- mute syllable: engendrent (df) 28/02/94
"d1s2",
"1du",
"1dû",
"1dy",
".dy2s3",
".dy2s1a2",
".dy2s1i2",
".dy2s1o2", -- missing from nb list
".dy2s1u2",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----e
".e4",
"'e4",
".ê4",
"'ê4",
".é4",
"'é4",
".è4",
"'è4",
"éd2hi", -- df-bg 1998/02/07 for rédhibitoire
"1é2drie",
"1é2drique",
"1é2lectr",
"1é2lément",
".en1a2",
"'en1a2",
"1é2nerg",
"e2n1i2vr",
".en1o2",
"'en1o2",
"épi2s3cop",
"épi3s4cope",
"e2s3cop",
".eu2r1a2",
"'eu2r1a2",
"eu1s2tat",
"extra1",
"extra2c",
"extra2i",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----f
"1fa",
"1fâ",
"1fe",
"1fé",
"1fè",
"1fê",
"4fe.",
"4fes.",
"2fent.", -- mute syllable: agrafent chauffent (df) 22/02/94
--
"1fi",
"1fî",
"1f2l",
"4fle.",
"4fles.",
"2flent.", -- mute syllable: gonflent (df) 28/02/94
"1fo",
"1fô",
"1f2r",
"4fre.",
"4fres.",
"2frent.", -- mute syllable: balafrent (df) 28/02/94
"f1s2",
"1fu",
"1fû",
"1fy",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----g
"1ga",
"1gâ",
"1ge",
"1gé",
"1gè",
"1gê",
"4ge.",
"4ges.",
-- words ending with -gent (df) 22/02/94
"2gent.",
"ré3gent.",
"entre3gent.",
"indi3gent.",
"dili3gent.",
"intelli3gent.",
"indul3gent.",
"tan3gent.",
"rin3gent.",
"contin3gent.",
".ar3gent.",
"'ar3gent.",
"ser3gent.",
"ter3gent.",
"résur3gent.",
--
"1g2ha",
"1g2he",
"1g2hi",
"1g2ho",
"1g2hy",
"1gi",
"1gî",
"1g2l",
"4gle.",
"4gles.",
"2glent.", -- mute syllable: meuglent (df) 28/02/94
"1g2n",
"'a2g3nat", -- (df) 16/01/02
".a2g3nat", -- (df) 16/01/02
"a2g3nos", -- (df) 16/01/02 (pattern dia2g3n deleted)
"co2g3niti", -- (df) 16/01/02
"'i2g3né", -- (df) 16/01/02
".i2g3né", -- (df) 16/01/02
"'i2g3ni", -- (df) 16/01/02
".i2g3ni", -- (df) 16/01/02
".ma2g3nicide", -- (df) 16/01/02
".ma2g3nificat", -- (df) 16/01/02
".ma2g3num", -- (df) 16/01/02
"o2g3nomoni", -- (df) 16/01/02
"o2g3nosi", -- (df) 16/01/02
".pro2g3nath", -- (df) 16/01/02
"pu2g3nable", -- (df) 16/01/02
"pu2g3nac", -- (df) 16/01/02
".sta2g3n",
".syn2g3nath", -- (df) 16/01/02
"wa2g3n",
"4gne.",
"4gnes.",
"2gnent.", -- mute syllable: accompagnent (df) 28/02/94
"1go",
"1gô",
"1g2r",
"4gre.",
"4gres.",
"2grent.", -- mute syllable: immigrent (df) 28/02/94
"1gu",
"1gû",
"g1s2",
"4gue.",
"4gues.",
-- words ending with -guent (df) 22/02/94
"2guent.",
".on3guent.",
"'on3guent.",
--
"1gy",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----h
"1ha",
"1hâ",
"1he",
"1hé",
"1hè",
"1hê",
"hémi1é",
"hémo1p2t",
"4he.",
"4hes.",
"1hi",
"1hî",
"1ho",
"1hô",
"1hu",
"1hû",
"1hy",
"hypera2",
"hypere2",
"hyperé2",
"hyperi2",
"hypero2",
"hypers2",
"hype4r1",
"hyperu2",
"hypo1a2",
"hypo1e2", -- missing from nb list
"hypo1é2",
"hypo1i2",
"hypo1o2",
"hypo1s2",
"hypo1u2",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----i
".i4",
"'i4",
".î4",
"'î4",
"i1algi",
"i1arthr",
"i1è2dre",
-- ill patterns missing from nb list
"il2l",
"cil3l",
"rcil4l",
"ucil4l",
"vacil4l",
"gil3l",
"hil3l",
"lil3l",
"l3lion",
"mil3l",
"mil4let",
"émil4l",
"semil4l",
"rmil4l",
"armil5l",
"capil3l",
"papil3la",
"papil3le",
"papil3li",
"papil3lom",
"pupil3l",
"piril3l",
"thril3l",
"cyril3l",
"ibril3l",
"pusil3l",
".stil3l",
"distil3l",
"instil3l",
"fritil3l",
"boutil3l",
"vanil3lin",
"vanil3lis",
"vil3l",
"avil4l",
"chevil4l",
"uevil4l",
"uvil4l",
"xil3l",
-- end of ill patterns
"1informat", -- missing from nb list
"'2informat",
".in1a2",
"'in1a2",
".in2a3nit",
"'in2a3nit",
".in2augur",
"'in2augur",
".in1e2",
"'in1e2",
".in1é2",
"'in1é2",
".in2effab", -- missing from nb list
"'in2effab",
".in2é3lucta",
"'in2é3lucta",
".in2é3narra",
"'in2é3narra",
".in2ept",
"'in2ept",
".in2er",
"'in2er",
".in2exora", -- missing from nb list
"'in2exora",
".in1i2",
"'in1i2",
".in2i3miti",
"'in2i3miti",
".in2i3q",
"'in2i3q",
".in2i3t",
"'in2i3t",
".in1o2",
"'in1o2",
".in2o3cul",
"'in2o3cul",
".in2ond",
"'in2ond",
".in1s2tab",
"'in1s2tab",
"'inte4r3",
".intera2",
"'intera2",
".intere2",
"'intere2",
".interé2",
"'interé2",
".interi2",
"'interi2",
".intero2",
"'intero2",
".inte4r3",
".interu2",
"'interu2",
".inters2",
"'inters2",
".in1u2",
"'in1u2",
".in2uit",
"'in2uit",
".in2u3l",
"'in2u3l",
"io1a2ct",
"i1oxy",
"i1s2tat",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----j
"1j",
"2jk",
"4je.",
"4jes.",
"2jent.", -- mute syllable: galèjent (df) 22/02/94
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----k
"1ka",
"1kâ",
"1ke",
"1ké",
"1kè",
"1kê",
"4ke.",
"4kes.",
"2kent.", -- mute syllable: jerkent (df) 22/02/94
"1k2h",
"4kh.",
".kh4",
"1ki",
"1kî",
"1ko",
"1kô",
"1k2r",
"1ku",
"1kû",
"1ky",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----l
"1la",
"1lâ",
"1là",
"la2w3re",
"1le",
"1lé",
"1lè",
"1lê",
"4le.",
"4les.",
-- words ending with -lent (df) 22/02/94
"2lent.",
".ta3lent.",
"iva3lent.",
"équiva4lent.",
"monova3lent.",
"polyva3lent.",
"re3lent.",
".do3lent.",
"indo3lent.",
"inso3lent.",
"turbu3lent.",
"succu3lent.",
"fécu3lent.",
"trucu3lent.",
"opu3lent.",
"corpu3lent.",
"ru3lent.",
"sporu4lent.",
--
"1li",
"1lî",
"1lo",
"1lô",
"l1s2t",
"1lu",
"1lû",
"1ly",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----m
"1ma",
"1mâ",
".ma2c3k",
".macro1s2c",
".ma2l1a2dres",
".ma2l1a2dro",
".ma2l1aisé",
".ma2l1ap",
".ma2l1a2v",
".ma2l1en",
".ma2l1int",
".ma2l1oc",
".ma2l1o2d",
".ma2r1x", -- nb (jbb: ?)
"1me",
"1mé",
"1mè",
"1mê",
".mé2g1oh",
".mé2sa", -- missing from nb list
".mé3san", -- missing from nb list
".mé2s1es",
".mé2s1i",
".mé2s1u2s",
".méta1s2ta",
"4me.",
"4mes.",
-- words ending with -ment (df) 22/02/94
"â2ment.",
"da2ment.",
"fa2ment.",
"amalga2ment.",
"cla2ment.",
"ra2ment.",
"tempéra3ment.",
"ta2ment.",
"testa3ment.",
"qua2ment.",
"è2ment.",
"carê2ment.",
"diaphrag2ment.",
"ryth2ment.",
"ai2ment.",
"rai3ment.",
"abî2ment.",
"éci2ment.",
"vidi2ment.",
"subli2ment.",
"éli2ment.",
"reli2ment.",
"mi2ment.",
"ani2ment.",
"veni2ment.",
"ri2ment.",
"détri3ment.",
"nutri3ment.",
"inti2ment.",
"esti2ment.",
"l2ment.",
"flam2ment.",
"gram2ment.",
".gem2ment.",
"om2ment.",
".com3ment.",
"ô2ment.",
"slalo2ment.",
"chro2ment.",
"to2ment.",
"ar2ment.",
".sar3ment.",
"er2ment.",
"antifer3ment.",
".ser3ment.",
"fir2ment.",
"or2ment.",
"as2ment.",
"au2ment.",
"écu2ment.",
"fu2ment.",
"hu2ment.",
"fichu3ment.",
"llu2ment.",
"plu2ment.",
"bou2ment.",
"bru2ment.",
"su2ment.",
"tu2ment.",
--
"1mi",
"1mî",
".milli1am",
"1m2némo",
"1m2nès",
"1m2nési",
"1mo",
"1mô",
"1mœ",
".mono1a2",
".mono1e2",
".mono1é2",
".mono1i2",
".mono1ï2dé",
".mono1o2",
".mono1u2",
".mono1s2",
"mon2t3réal", -- missing from nb list
"m1s2",
"1mu",
"1mû",
"1my",
"moye2n1â2g",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----n
"1na",
"1nâ",
"1ne",
"1né",
"1nè",
"1nê",
"4ne.",
"4nes.",
-- words ending with -nent (df) 22/02/94
"2nent.", -- fric-tionnent - syllable muette - bg 27/12/93
"réma3nent.",
"imma3nent.",
"perma3nent.",
".émi3nent.",
"préémi3nent.",
"proémi3nent.",
"surémi3nent.",
"immi3nent.",
"conti3nent.",
"perti3nent.",
"absti3nent.",
--
"1ni",
"1nî",
"1no",
"1nô",
"1nœ",
".no2n1obs",
"1nu",
"1nû",
"n3s2at.",
"n3s2ats.",
"n1x",
"1ny",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----o
".o4",
"'o4",
"'ô4",
".ô4",
--'ö2 -- mjf -- deleted 3/1/94 df-bg
"o2b3long",
"1octet", -- missing from nb list
"'2octet",
"o1d2l",
"o1è2dre",
"o1ioni",
"ombud2s3",
"omni1s2",
"o1s2tas",
"o1s2tat",
"o1s2téro",
"o1s2tim",
"o1s2tom",
"o1s2trad",
"o1s2tratu",
"o1s2triction",
".oua1ou",
"'oua1ou",
".ovi1s2c",
"'ovi1s2c",
"oxy1a2",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----p
"1pa",
"1pâ",
"paléo1é2",
".pa2n1a2f",
".pa2n1a2mé",
".pa2n1a2ra",
".pa2n1is",
".pa2n1o2ph",
".pa2n1opt",
".pa2r1a2che",
".pa2r1a2chè",
".para1s2",
".pa2r3hé",
"1pe",
"1pé",
"1pè",
"1pê",
"4pe.",
"4pes.",
-- words ending with -pent (df) 22/02/94
"2pent.",
"re3pent.",
".ar3pent.",
"'ar3pent.",
"ser3pent.",
--
".pen2ta", -- pent- or penta- but never pen-ta bg 12/27/93
"per3h",
"pé2nul", -- pé2n1ul moved back 09/17/92 to JD def.
".pe4r",
".per1a2",
".per1e2",
".per1é2",
".per1i2",
".per1o2",
".per1u2",
"pé1r2é2q", -- 2r1 moved 09/17/92 to 1r2(it was a typo)
".péri1os",
".péri1s2",
".péri2s3s",
".péri2s3ta",
".péri1u2",
"1p2h",
".ph4",
"4ph.",
".phalan3s2t",
"4phe.",
"4phes.",
"2phent.", -- mute syllable: triomphent (df) 22/02/94
"ph2l",
"4phle.",
"4phles.",
"2phn",
"photo1s2",
"ph2r",
"4phre.",
"4phres.",
"2phs",
"2pht",
"3ph2talé",
"3ph2tis",
-------- Here is an example of a pb involving phonetic and etymologic patterns 5/94
--------                .phyto3ph2 -- originaly, but wrong for phy-toph-thora   9/92
--------                .phy2topha -- for -pharmacie but wrong for phyto-biol.. 5/94
"1pi",
"1pî",
"1p2l",
"4ple.",
"4ples.",
"2plent.", -- mute syllable: accouplent (df) 28/02/94
".pluri1a",
"1p2né",
"1p2neu",
"1po",
"1pô",
"po1astre",
"poly1a2",
"poly1e2",
"poly1é2",
"poly1è2",
"poly1i2",
"poly1o2",
"poly1s2",
"poly1u2",
".pon2tet", -- JD hypenated it asis 09/17/92, exception
".pos2t3h",
".pos2t1in",
".pos2t1o2",
".pos2t3r",
".post1s2",
"1p2r",
"4pre.",
"4pres.",
"2prent.", -- mute syllable: empourprent (df) 28/02/94
".pré1a2",
".pré2a3la", -- missing from nb list
".pré2au",
".pré1é2",
".pré1e2",
".pré1i2",
".pré1o2",
".pré1u2",
".pré1s2",
".pro1é2",
".pro1s2cé",
"pro2s3tat",
".prou3d2h",
"1p2sych",
".psycho1a2n",
"1p2tèr",
"1p2tér",
"1pu",
".pud1d2l",
"1pû",
"1py",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----q
"1q",
"4que.",
"4ques.",
-- words ending with -quent (df) 22/02/94
"2quent.",
"é3quent.",
"élo3quent.",
"grandilo3quent.",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----r
"1ra",
"1râ",
"radio1a2", -- missing from nb list
"1re",
"1ré",
"1rè",
"1rê",
".ré1a2",
".ré2a3le",
".ré2a3lis",
".ré2a3lit",
".ré2aux",
".ré1é2",
".ré1e2",
".ré2el",
".ré2er",
".ré2èr",
".ré1i2",
".ré2i3fi",
".ré1o2",
".re1s2",
".re2s3cap",
".re2s3cisi", -- for res-cision  09/17/92 (missing from nb)
".re2s3ciso", -- for res-cisoire 09/17/92(missing from nb)
".re2s3cou",
".re2s3cri",
".re2s3pect",
".re2s3pir",
".re2s3plend",
".re2s3pons",
".re2s3quil",
".re2s3s",
".re2s3t",
".re3s4tab",
".re3s4tag",
".re3s4tand",
".re3s4tat",
".re3s4tén",
".re3s4tér",
".re3s4tim",
".re3s4tip",
".re3s4toc",
".re3s4top",
".re3s4tr",
".re4s5trein",
".re4s5trict",
".re4s5trin",
".re3s4tu",
".re3s4ty",
".réu2", --.ré1u2 -- pattern rejected 12/2/92
-- (don't hyphenate as ré-union nor réu-nion)
".ré2uss",
".rétro1a2",
"4re.",
"4res.",
-- words ending with -rent (df) 22/02/94
"2rent.", -- es-pèrent - syllable muette - bg 27/12/93
".pa3rent.",
"appa3rent.",
"transpa3rent.",
"é3rent.",
"tor3rent.",
"cur3rent.",
--
"1r2h",
"4rhe.",
"4rhes.",
"2r3heur",
"2r3hydr",
"1ri",
"1rî",
"1ro",
"1rô",
"1ru",
"1rû",
"1ry",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----s
"1sa",
"1sâ",
".sch4",
"1s2caph",
"1s2clér",
"1s2cop",
"1s2ch",
"e2s3ch",
"i2s3ché",
"i2s3chia",
"i2s3chio",
"4sch.",
"4sche.",
"4sches.",
"2schs",
"1se",
"1sé",
"1sè",
"1sê",
"sesqui1a2",
"4se.",
"4ses.",
-- words ending with -sent (df) 22/02/94
"2sent.", -- massent - syllable muette - bg 27/12/93
"ab3sent.",
"pré3sent.",
".res3sent.",
--
".seu2le", -- jbb
".sh4",
"1s2h",
"4sh.",
"4she.",
"4shes.",
"2shent.", -- mute syllable: smashent (df) 22/02/94
"2shm",
"2s3hom",
"2shr",
"2shs",
"1si",
"1sî",
"1s2lav",
"1s2lov",
"1so",
"1sô",
"1sœ",
"1s2patia",
"1s2perm",
"1s2por",
"1s2phèr",
"1s2phér",
"1s2piel",
"1s2piros",
"1s2tandard",
"1s2tein",
"stéréo1s2",
"1s2tigm",
"1s2tock",
"1s2tomos",
"1s2troph",
"1s2tructu",
"1s2tyle",
"1su",
"1sû",
".su2b1a2",
".su3b2alt",
".su2b1é2",
".su3b2é3r",
".su2b1in",
".su2b3limin",
".su2b3lin",
".su2b3lu",
"sub1s2",
".su2b1ur",
"supero2",
"supe4r1",
"supers2",
".su2r1a2",
"su3r2ah",
".su3r2a3t",
".su2r1e2",
".su3r2eau",
".su3r2ell",
".su3r2et",
".su2r1é2",
".su2r3h",
".su2r1i2m",
".su2r1inf",
".su2r1int",
".su2r1of",
".su2r1ox",
"1sy",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----t
"1ta",
"1tâ",
"1tà",
"tachy1a2",
"tchin3t2",
"1te",
"1té",
"1tè",
"1tê",
"télé1e2",
"télé1i2",
"télé1o2b",
"télé1o2p",
"télé1s2",
"4te.",
"4tes.",
-- words ending with -tent (df) 22/02/94
"2tent.", -- mentent - syllable muette - bg 27/12/93
".la3tent.",
".pa3tent.",
"compé3tent.",
"éni3tent.",
"mécon3tent.",
"omnipo3tent.",
"ventripo3tent.",
"équipo3tent.",
"impo3tent.",
"mit3tent.",
--
".th4",
"1t2h",
"4th.",
"4the.",
"4thes.",
"thermo1s2",
"2t3heur",
"2thl", -- th2l  was wrong for ...ath-lon (jd said 2thl) df 12/27/93
"2thm",
"2thn",
"th2r",
"4thre.",
"4thres.",
"2ths",
"1ti",
"1tî",
"1to",
"1tô",
"1t2r",
"tran2s1a2",
"tran3s2act",
"tran3s2ats",
"tran2s3h",
"tran2s1o2",
"tran2s3p",
"tran2s1u2",
"4tre.",
"4tres.",
"2trent.", -- mute syllable: infiltrent (df) 28/02/94
".tri1a2c",
".tri1a2n",
".tri1a2t",
".tri1o2n",
"t1t2l",
"1tu",
"1tû",
"tung2s3",
"1ty",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----u
".u4",
"'u4",
".û4",
"'û4",
"uni1o2v",
"uni1a2x",
"u2s3tr",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----v
"1va",
"1vâ",
"1ve",
"1vé",
"1vè",
"1vê",
"vélo1s2ki",
"4ve.",
"4ves.",
-- words ending with -vent (df) 22/02/94
"2vent.",
"conni3vent.",
".sou3vent.",
--
"1vi",
"1vî",
"1vo",
"1vô",
"vol2t1amp",
"1v2r",
"4vre.",
"4vres.",
"2vrent.", -- mute syllable: recouvrent (df) 28/02/94
"1vu",
"1vû",
"1vy",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----w
"1wa",
"1we",
"4we.",
"4wes.",
"2went.", -- mute syllable: interviewent (df) 22/02/94
"1wi",
"1wo",
"1wu",
"1w2r",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----x
"2xent.", -- mute syllable:  malaxent (df) 22/02/94
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----y
".y4",
"'y4",
"y1asth",
"y1s2tom",
"y1algi",
------------------------------------------------
-- phonetic patterns -- etymological patterns --
------------------------------------------------
----z
"1za",
"1ze",
"1zé",
"1zè",
"4ze.",
"4zes.",
-- words ending with -zent (df) 22/02/94
"2zent.",
"privatdo3zent.",
--
"1zi",
"1zo",
"1zu",
"1zy",
}

sile-typesetter / sile / 6941442205

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous