From 2b97c3bb463b28e3d81f714ef55798621174e0a1 Mon Sep 17 00:00:00 2001
From: Ri Xu <xuri.me@gmail.com>
Date: Mon, 9 Apr 2018 19:44:08 +0800
Subject: [PATCH] - Support to read inlineStr type cell value, relate issue
 #208, PR #209; - go test and godoc has been updated

---
 rows.go         |   2 ++
 test/Book1.xlsx | Bin 22981 -> 23005 bytes
 xmlWorksheet.go |  22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/rows.go b/rows.go
index f7ae7f9..25a2049 100644
--- a/rows.go
+++ b/rows.go
@@ -174,6 +174,8 @@ func (xlsx *xlsxC) getValueFrom(f *File, d *xlsxSST) (string, error) {
 		return f.formattedValue(xlsx.S, d.SI[xlsxSI].T), nil
 	case "str":
 		return f.formattedValue(xlsx.S, xlsx.V), nil
+	case "inlineStr":
+		return f.formattedValue(xlsx.S, xlsx.IS.T), nil
 	default:
 		return f.formattedValue(xlsx.S, xlsx.V), nil
 	}
diff --git a/test/Book1.xlsx b/test/Book1.xlsx
index 7168ff1e74c9fd67e7b86e7ed16815135baaca94..f94dfe9244a1a6c59be67ffe434022fef479adc7 100644
GIT binary patch
delta 1357
zcmX@Qnepys#trODOf&m8b26DRf@nu(Pi7!Jxra?2#9hng2NItAmt76SRpls<0dc3R
zXn?o}Ro1hD=prq1J`layA`xr|pVe*-kh0TGS|H)?PA)7$jI;WEWcT_%lVN6Hi05Kp
zkYJcx7%5dhH!OPcECZ3c_dfrbCx6#-aX1oKzU|iBch1Y_#?4n|JE<cu%O&=It^Xlc
zvy9_kT_;U0-go*T$C-EWU3YE<D@y7==eS>aVqxkb^EG$QU0grEUtaCR#I7mQlRi&6
zcX6Uu$^MG}d1VhCMW#*BVi)kTbe|b?^-5{#q>D`_tm7^U`32SMaV<*F-nMQHi>h>R
z$dh*`J|D|-jOfg2S-FF)dAX+di!SxuP19Df37V*LeL39|y2(|0QuYHbrFrF7+grp%
z9o9siyK=EXX}QNT|J#$eH=R59otw|&Qqt?Q0{ap=A52>QitmBcLg(`vrFS=MnUO1D
zaUr*y#rOFOM*naL<#I#gllA*0ZBN|0b@6Xp@xL|Z{<AGV3Cy`PN6pJwV8@%6lb-#Q
z(f!Er?q<A$X*Tc6GK=M3IsacYc{01;n#(2C^Zz&Wo=T8N5HmAT-5pc=y#4%?Tw~V2
zjNXs-cV)su)C$BM&dgotS)q4!{p2@G9=US2%xR8$xko_CJMP(uc5Us4x2{~hSihpv
zt?EVJuJ>|t{)=xs*ggByjT@~^*Y0#_Y?{GYSJ1L@vgpOjUCSAZdgi~_Ghcvl{kqBv
zuFFLDR9wDu+Z2DFwe;kV8)-Xy6C&B&_D;I^dQ#}*i&JY>eT<yBdD6cCrY?zyfNnjb
zVo?T%3k!BUSh3l3*U@Vk3E4R}vy8G%e|&v7wZ8Vn_fyKJljaJ}FqWvPwVLwozS3QJ
zkMFuKecjH=MqK*a_@z_z?t4%EL)@2|qnEHVzid>sec{P}eA<@;1>0>)*sqt^?s46v
zcWJ5my9<-#zU}VQefiMAicjZlqJMRVeun(_t??CNTjxAhT%KRpS3Sp$?|iXa{(~O2
zIrCg4ziND}*Rb-ptYm(=gze4kE%VKNy=>optUUFD>(n#LJ9~LwJ^W~;`7wZN+ma)H
z``9Ocj@nS(I^$j8Yu?DW%U;j9T<}vo;$w6~;rvj}=0BmSAvdn<cyF=G!FE^Iu62dg
z>$f#^t*!ig`rfXe%OqZR>1AA7{-i7CrMS|zHB<cjf}I%`Yd$!qur2$j_U0!0XS1|-
zynn0L+%Ki|g^$hlX^g4#=WlQAc*Q4YdX<2((tR&OK8w>c?yS0UnGr%ymh%S7^o2=J
zUhgd_j4FGXaTY7%<o*EB$sfEAfehH<qsJ#9G8b$Bgr5AtM;s&rGC;*w65V)j-)4~P
z1z%IX74K((^+D*#7s5nX85j-$C3XC)(X~AclG@zww;WuESOl4)>wOpm(>pE57EN;V
z!=PkvX#;XmVu&P~G|;^wo9Be+ft6hFm7e@OR0`co{9&~aFPWgrTnM`hl35>aDTEpf
wml@xOPi_nn2FdbA*rV%<iTKKkQg%&_i?n3(kh`d~`pV?FkxFdMUJO700KD;%FaQ7m

delta 1394
zcmcb+nepgm#trODOn!ZvIho8DL9`>YCo_<q+`}dh;;v=$0|`(5%dQ6Es&W*_fVk6D
zG(g;gD(hK6bdi=hABbLUkq9<~&uTXZNZDy8Es*ecCl?l>r+$4t=ics$W?^Pv(BfiX
zkYJcBA1PXIq*sxfGk4nQzS#yMZQrN<;ydx1?Tl)RMv95A$t#^zVWIlj>^=_6Gj91A
zRsNQf_K=tyGBc-1|M{Q)&ku8MsHj-$mF>S%BSKc$rf`Dm>z1XidwVagpYK0E?S#;z
zE1H^-zR4v^m~3_I>mp<%>IE&AUSevEI-)Us)6Co3Jc^<O>kSim*Cwhb?@<z3R+HV`
z7Ch<Il2uz`kI%d%s+n~~>&#DGDV@_@E$bpTt<KPm7WDI0YK(v4s$8{IYp3fvr9Y|H
zYrG<^HXK=|!CiS}(TP=)etzDTHYdl+;=A@Y&r8{>Pe$z15<16n`U%Sus|z1zDqC-I
z%-re0ZPBQ;`)H=vVt1SR_~f29Po3ER>%DN~IW}$8_qL7Vrj>rlPZVw}RrOsmNul88
zWl`PJ5^Fbbe}ALD;?>4UTl}q_e~kR^DgMNIyP3-cQSJXCE6*&HTp%7aYhtWs{f5Kh
zQ8~q&s{^EJ|5aAS1W!B=%P^yJn`eaPm-SQMw4{XUx2$QFTDgOP%R4Ul$-(-qD<0l@
zx^;EpcBxg%tXJ)_-ta&EsGt5TBjwr{j~D#g)h6kP&ym$x_u0icWc#C?{W`VtK76WV
zV%ewlJW%yz$PIxFyW$_U?hV(AJ@VY{&^xiPw@ua_h4+`O+0Eh0U7+stUCyc8#ln<h
zcgHlls@*%Y%=bE0Wn9=MxbI%G+`BT~lKS^@CHXDyBwxh3ynZYF;vPqB+Jb8468jxZ
z@9sCh>%UOTd{=$}doYk(=+3sQ-ur5E^@Y$$UbfZjY*hwptjsPn3tD~S{g!Y*?t%83
z%Zk6J9`|~0DO+9D_Ppf5%ZCp(rT^eNU-0Cm#I%P8gmynnJ$=(!Cw=XM4>O)EUd)}j
z+jdudj^y2ho3=sz{NJ`!&Jp%9aXZN7WwK_6{q8eObEOmf{Qc73WQoNdoiqFN?nhns
zA9uB{o0R=D-)Q-rEyoTEw}-E}JA2J-nd%SIR%zUSHGPLf&+hZhD^FSIzWQjnLoxc-
z)DO9V+^d(&+}3dINkRJWjVZly2jz<otK9isH|_9u&Zk+tY`yag)pmE*na<t!Y1-sQ
zuM$wc`R-*XB9ZA)KKb%xMi|Y$=im3qjsYT*1H7X^Y7~8?Cm;8g<b%mW=*jQA?|@{_
z_~`L<^m>6!fY6f{gov;*FdPDFH9?n5_H71fd*N%Uj;if4<Bz)k-#<rRVhr$RWU^-v
zVE_S;DK382{Ag+?=Lbt}UhcOXT!I7ynPZrx@ddkC>w;{tnk5|U2`+v>o~;a#M054#
z1tCsg=_jG4LTFB5?7TPGK0s`;V^}iCV;}<#hDl<m`cXG|qMz7gGb_Hy0^wUhDvyU-
zqFFPUFG3t7qaI<8p`Y(8P`~)({)k(=C<WZ)vPes|3w)XLCSRVsHByN!+Y1zI07Gnd
Avj6}9

diff --git a/xmlWorksheet.go b/xmlWorksheet.go
index 748ca1f..37c0d18 100644
--- a/xmlWorksheet.go
+++ b/xmlWorksheet.go
@@ -304,6 +304,19 @@ type xlsxDataValidations struct {
 // xlsxC directly maps the c element in the namespace
 // http://schemas.openxmlformats.org/spreadsheetml/2006/main - currently I have
 // not checked it for completeness - it does as much as I need.
+//
+// This simple type is restricted to the values listed in the following table:
+//
+//      Enumeration Value         | Description
+//     ---------------------------+---------------------------------
+//      b (Boolean)               | Cell containing a boolean.
+//      d (Date)                  | Cell contains a date in the ISO 8601 format.
+//      e (Error)                 | Cell containing an error.
+//      inlineStr (Inline String) | Cell containing an (inline) rich string, i.e., one not in the shared string table. If this cell type is used, then the cell value is in the is element rather than the v element in the cell (c element).
+//      n (Number)                | Cell containing a number.
+//      s (Shared String)         | Cell containing a shared string.
+//      str (String)              | Cell containing a formula string.
+//
 type xlsxC struct {
 	R string `xml:"r,attr"`           // Cell ID, e.g. A1
 	S int    `xml:"s,attr,omitempty"` // Style reference.
@@ -311,9 +324,18 @@ type xlsxC struct {
 	T        string   `xml:"t,attr,omitempty"` // Type.
 	F        *xlsxF   `xml:"f,omitempty"`      // Formula
 	V        string   `xml:"v,omitempty"`      // Value
+	IS       *xlsxIS  `xml:"is"`
 	XMLSpace xml.Attr `xml:"space,attr,omitempty"`
 }
 
+// xlsxIS directly maps the t element. Cell containing an (inline) rich
+// string, i.e., one not in the shared string table. If this cell type is
+// used, then the cell value is in the is element rather than the v element in
+// the cell (c element).
+type xlsxIS struct {
+	T string `xml:"t"`
+}
+
 // xlsxF directly maps the f element in the namespace
 // http://schemas.openxmlformats.org/spreadsheetml/2006/main - currently I have
 // not checked it for completeness - it does as much as I need.