The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit 042a1c4d3b421d4268774fcc172f21e18eaca2ee
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Tue Aug 21 12:48:34 2012 +0200
Make tipa shortcuts work for combining chars
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index df70b69..e80ddc1 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -859,7 +859,13 @@ int Paragraph::Private::latexSurrogatePair(otexstream &
os, char_type c,
// FIXME: change tracking
// Is this correct WRT change tracking?
Encoding const & encoding = *(runparams.encoding);
- docstring const latex1 = encoding.latexChar(next).first;
+ docstring latex1 = encoding.latexChar(next).first;
+ if (runparams.inIPA) {
+ string const tipashortcut = Encodings::TIPAShortcut(next);
+ if (!tipashortcut.empty()) {
+ latex1 = from_ascii(tipashortcut);
+ }
+ }
docstring const latex2 = encoding.latexChar(c).first;
if (docstring(1, next) == latex1) {
// the encoding supports the combination
commit f251c4973c298bd6d31048337681c4e6ff550679
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Tue Aug 21 12:47:50 2012 +0200
More tipa shortcuts
diff --git a/lib/unicodesymbols b/lib/unicodesymbols
index 51f9748..74fbc73 100644
--- a/lib/unicodesymbols
+++ b/lib/unicodesymbols
@@ -689,7 +689,7 @@
0x031d "\\textraising" "tipa" "combining,force" # COMBINING UP TACK
BELOW
0x031e "\\textlowering" "tipa" "combining,force" # COMBINING DOWN
TACK BELOW
0x031f "\\textsubplus" "tipa" "combining,force" # COMBINING PLUS
SIGN BELOW
-0x0320 "\\b" "" "combining,force" # COMBINING MINUS SIGN
BELOW
+0x0320 "\\b" "" "combining,force,tipashortcut=\\=*" #
COMBINING MINUS SIGN BELOW
#0x0321 "" "" "combining,force" # COMBINING
PALATALIZED HOOK BELOW
#0x0322 "" "" "combining,force" # COMBINING RETROFLEX
HOOK BELOW
0x0323 "\\d" "" "combining,force" # COMBINING DOT BELOW
@@ -698,7 +698,7 @@
#0x0326 "" "" "combining,force" # COMBINING COMMA BELOW
0x0327 "\\c" "" "combining,force" # COMBINING CEDILLA
0x0328 "\\k" "" "combining,force" # COMBINING OGONEK
-0x0329 "\\textsyllabic" "tipa" "combining,force" # COMBINING
VERTICAL LINE BELOW
+0x0329 "\\textsyllabic" "tipa" "combining,force,tipashortcut=\\s" #
COMBINING VERTICAL LINE BELOW
0x032a "\\textsubbridge" "tipa" "combining,force" # COMBINING BRIDGE
BELOW
0x032b "\\textsubw" "tipa" "combining,force" # COMBINING
INVERTED DOUBLE ARCH BELOW
0x032c "\\textsubwedge" "tipa" "combining,force" # COMBINING CARON
BELOW
-----------------------------------------------------------------------
Summary of changes:
lib/unicodesymbols | 4 ++--
src/Paragraph.cpp | 8 +++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
