feat: office-viewer 支持 sdt、footnote、endnote,包名换成 ooxml-viewer (#6509)

* 支持嵌套 sdt

* 初步支持 footnote 和 endnote

* 修复默认展示问题

* 初步支持 footnote 和 endnote

* 换包名
This commit is contained in:
吴多益 2023-04-03 12:53:44 +08:00 committed by GitHub
parent 19db1a8f48
commit ef9ada9783
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
342 changed files with 2996 additions and 386 deletions

View File

@ -17,7 +17,7 @@
"path": "./packages/amis" "path": "./packages/amis"
}, },
{ {
"path": "./packages/office-viewer" "path": "./packages/ooxml-viewer"
} }
] ]
} }

View File

@ -490,7 +490,7 @@ if (fis.project.currentMedia() === 'publish-sdk') {
'!markdown-it/**', '!markdown-it/**',
'!markdown-it-html5-media/**', '!markdown-it-html5-media/**',
'!punycode/**', '!punycode/**',
'!office-viewer/**', '!ooxml-viewer/**',
'!fflate/**' '!fflate/**'
], ],
@ -532,7 +532,7 @@ if (fis.project.currentMedia() === 'publish-sdk') {
'charts.js': ['zrender/**', 'echarts/**', 'echarts-stat/**'], 'charts.js': ['zrender/**', 'echarts/**', 'echarts-stat/**'],
'office-viewer.js': ['office-viewer/**', 'fflate/**'], 'ooxml-viewer.js': ['ooxml-viewer/**', 'fflate/**'],
'rest.js': [ 'rest.js': [
'*.js', '*.js',
@ -555,7 +555,7 @@ if (fis.project.currentMedia() === 'publish-sdk') {
'!uc.micro/**', '!uc.micro/**',
'!markdown-it/**', '!markdown-it/**',
'!markdown-it-html5-media/**', '!markdown-it-html5-media/**',
'!office-viewer/**', '!ooxml-viewer/**',
'!fflate/**' '!fflate/**'
] ]
}), }),
@ -784,7 +784,7 @@ if (fis.project.currentMedia() === 'publish-sdk') {
'!punycode/**', '!punycode/**',
'!amis-formula/**', '!amis-formula/**',
'!fflate/**', '!fflate/**',
'!office-viewer/**', '!ooxml-viewer/**',
'!amis-core/**', '!amis-core/**',
'!amis-ui/**', '!amis-ui/**',
'!amis/**' '!amis/**'
@ -843,7 +843,7 @@ if (fis.project.currentMedia() === 'publish-sdk') {
'!/examples/components/EChartsEditor/Common.tsx' '!/examples/components/EChartsEditor/Common.tsx'
], ],
'pkg/office-viewer.js': ['office-viewer/**', 'fflate/**'], 'pkg/ooxml-viewer.js': ['ooxml-viewer/**', 'fflate/**'],
'pkg/rest.js': [ 'pkg/rest.js': [
'**.{js,jsx,ts,tsx}', '**.{js,jsx,ts,tsx}',

View File

@ -4,7 +4,7 @@
"packages/amis-core", "packages/amis-core",
"packages/amis-ui", "packages/amis-ui",
"packages/amis", "packages/amis",
"packages/office-viewer" "packages/ooxml-viewer"
], ],
"version": "2.9.0" "version": "2.9.0"
} }

View File

@ -7,7 +7,7 @@
"packages/amis", "packages/amis",
"packages/amis-editor-core", "packages/amis-editor-core",
"packages/amis-editor", "packages/amis-editor",
"packages/office-viewer" "packages/ooxml-viewer"
], ],
"scripts": { "scripts": {
"fis3-serve": "fis3 server start --www ./public --port 8888 --no-daemon --no-browse", "fis3-serve": "fis3 server start --www ./public --port 8888 --no-daemon --no-browse",
@ -103,7 +103,7 @@
"^amis\\-ui$": "<rootDir>/packages/amis-ui/src/index.tsx", "^amis\\-ui$": "<rootDir>/packages/amis-ui/src/index.tsx",
"^amis\\-core$": "<rootDir>/packages/amis-core/src/index.tsx", "^amis\\-core$": "<rootDir>/packages/amis-core/src/index.tsx",
"^amis\\-formula$": "<rootDir>/packages/amis-formula/src/index.ts", "^amis\\-formula$": "<rootDir>/packages/amis-formula/src/index.ts",
"^office\\-viewer$": "<rootDir>/packages/office-viewer/src/index.ts", "^office\\-viewer$": "<rootDir>/packages/ooxml-viewer/src/index.ts",
"^amis$": "<rootDir>/packages/amis/src/index.tsx" "^amis$": "<rootDir>/packages/amis/src/index.tsx"
}, },
"setupFilesAfterEnv": [ "setupFilesAfterEnv": [

View File

@ -64,7 +64,7 @@
"mobx-state-tree": "^3.17.3", "mobx-state-tree": "^3.17.3",
"moment": "^2.19.4", "moment": "^2.19.4",
"mpegts.js": "^1.6.10", "mpegts.js": "^1.6.10",
"office-viewer": "0.1.0", "ooxml-viewer": "0.1.0",
"prop-types": "^15.6.1", "prop-types": "^15.6.1",
"qrcode.react": "^3.1.0", "qrcode.react": "^3.1.0",
"rc-overflow": "^1.2.4", "rc-overflow": "^1.2.4",
@ -238,7 +238,7 @@
"peerDependencies": { "peerDependencies": {
"amis-core": "*", "amis-core": "*",
"amis-ui": "*", "amis-ui": "*",
"office-viewer": "*", "ooxml-viewer": "*",
"react": ">=16.8.6", "react": ">=16.8.6",
"react-dom": ">=16.8.6" "react-dom": ">=16.8.6"
}, },

View File

@ -119,7 +119,7 @@ function getPlugins(format = 'esm') {
'amis-formula', 'amis-formula',
'amis-core', 'amis-core',
'amis-ui', 'amis-ui',
'office-viewer' 'ooxml-viewer'
].reduce( ].reduce(
(prev, current) => ({ (prev, current) => ({
...prev, ...prev,

View File

@ -15,7 +15,7 @@ import {
resolveVariableAndFilter, resolveVariableAndFilter,
ScopedContext ScopedContext
} from 'amis-core'; } from 'amis-core';
import type {Word} from 'office-viewer'; import type {Word} from 'ooxml-viewer';
import {Spinner} from 'amis-ui'; import {Spinner} from 'amis-ui';
export interface OfficeViewerSchema extends BaseSchema { export interface OfficeViewerSchema extends BaseSchema {
@ -137,7 +137,7 @@ export default class OfficeViewer extends React.Component<
responseType: 'arraybuffer' responseType: 'arraybuffer'
}); });
import('office-viewer').then(async (officeViewer: any) => { import('ooxml-viewer').then(async (officeViewer: any) => {
const Word = officeViewer.Word; const Word = officeViewer.Word;
const word = new Word(response.data, { const word = new Word(response.data, {
...wordOptions, ...wordOptions,
@ -164,7 +164,7 @@ export default class OfficeViewer extends React.Component<
reader.onload = _e => { reader.onload = _e => {
const data = reader.result as ArrayBuffer; const data = reader.result as ArrayBuffer;
import('office-viewer').then(async (officeViewer: any) => { import('ooxml-viewer').then(async (officeViewer: any) => {
const Word = officeViewer.Word; const Word = officeViewer.Word;
const word = new Word(data, { const word = new Word(data, {
...wordOptions, ...wordOptions,
@ -187,12 +187,13 @@ export default class OfficeViewer extends React.Component<
loading = false, loading = false,
src, src,
name, name,
display,
loadingConfig loadingConfig
} = this.props; } = this.props;
return ( return (
<div ref={this.rootElement} className={cx('Office-Viewer', className)}> <div ref={this.rootElement} className={cx('ooxml-viewer', className)}>
{/* 避免没内容时编辑器都选不了 */} {/* 避免没内容时编辑器都选不了 */}
{(!src || !name) && ( {display !== false && !src && !name && (
<svg width="100%" height="100" xmlns="http://www.w3.org/2000/svg"> <svg width="100%" height="100" xmlns="http://www.w3.org/2000/svg">
<rect <rect
x="0" x="0"

View File

@ -14,6 +14,6 @@
"references": [ "references": [
{"path": "../amis-core"}, {"path": "../amis-core"},
{"path": "../amis-ui"}, {"path": "../amis-ui"},
{"path": "../office-viewer"} {"path": "../ooxml-viewer"}
] ]
} }

View File

@ -1,111 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<w:document xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 w15 wp14">
<w:body>
<w:p w:rsidR="00A97433" w:rsidRPr="003741F5" w:rsidRDefault="00A97433" w:rsidP="00A97433">
<w:pPr>
<w:pStyle w:val="EndNoteBibliography"/>
</w:pPr>
<w:r w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman"/>
</w:rPr>
<w:t xml:space="preserve">US is about 400,000 and over two million </w:t>
</w:r>
<w:r w:rsidR="007714DF" w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman"/>
</w:rPr>
<w:t xml:space="preserve">people </w:t>
</w:r>
<w:r w:rsidR="00F21877" w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman"/>
</w:rPr>
<w:t xml:space="preserve">are </w:t>
</w:r>
<w:r w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman"/>
</w:rPr>
<w:fldChar w:fldCharType="begin"/>
</w:r>
<w:r w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman"/>
</w:rPr>
<w:instrText xml:space="preserve"> ADDIN EN.REFLIST </w:instrText>
</w:r>
<w:r w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman"/>
</w:rPr>
<w:fldChar w:fldCharType="separate"/>
</w:r>
<w:bookmarkStart w:id="0" w:name="_ENREF_1"/>
<w:r w:rsidRPr="003741F5">
<w:t>1.</w:t>
</w:r>
<w:r w:rsidRPr="003741F5">
<w:tab/>
<w:t>Orton SM, Herrera BM, Yee IM, et al. Sex ratio of multiple sclerosis in Canada: a longitudinal study. Lancet Neurol 2006;5:932-6.</w:t>
</w:r>
<w:bookmarkEnd w:id="0"/>
</w:p>
<w:p w:rsidR="00A97433" w:rsidRPr="003741F5" w:rsidRDefault="00A97433" w:rsidP="00A97433">
<w:pPr>
<w:pStyle w:val="EndNoteBibliography"/>
</w:pPr>
<w:bookmarkStart w:id="1" w:name="_ENREF_2"/>
<w:r w:rsidRPr="003741F5">
<w:t>2.</w:t>
</w:r>
<w:r w:rsidRPr="003741F5">
<w:tab/>
<w:t>Kister I, Chamot E, Salter AR, Cutter GR, Bacon TE, Herbert J. Disability in multiple sclerosis: a reference for patients and clinicians. Neurology 2013;80:1018-24.</w:t>
</w:r>
<w:bookmarkEnd w:id="1"/>
</w:p>
<w:p w:rsidR="00A97433" w:rsidRPr="003741F5" w:rsidRDefault="00A97433" w:rsidP="00A97433">
<w:pPr>
<w:pStyle w:val="EndNoteBibliography"/>
</w:pPr>
<w:bookmarkStart w:id="2" w:name="_ENREF_3"/>
<w:r w:rsidRPr="003741F5">
<w:t>3.</w:t>
</w:r>
<w:r w:rsidRPr="003741F5">
<w:tab/>
<w:t>Mayr WT, Pittock SJ, McClelland RL, Jorgensen NW, Noseworthy JH, Rodriguez M. Incidence and prevalence of multiple sclerosis in Olmsted County, Minnesota, 1985-2000. Neurology 2003;61:1373-7.</w:t>
</w:r>
<w:bookmarkEnd w:id="2"/>
</w:p>
<w:p w:rsidR="00A97433" w:rsidRPr="00E63F36" w:rsidRDefault="00A97433" w:rsidP="00A97433">
<w:pPr>
<w:pStyle w:val="Default"/>
<w:spacing w:line="480" w:lineRule="auto"/>
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:color w:val="auto"/>
</w:rPr>
</w:pPr>
<w:r w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman"/>
</w:rPr>
<w:fldChar w:fldCharType="end"/>
</w:r>
<w:r w:rsidR="000E1EAF" w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman"/>
</w:rPr>
<w:t xml:space="preserve"> expected </w:t>
</w:r>
<w:r w:rsidR="00B22C62" w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman"/>
</w:rPr>
<w:t>increase in the number of cases in future</w:t>
</w:r>
</w:p>
</w:body>
</w:document>

View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<w:document xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 w15 wp14">
<w:body>
<w:p w:rsidR="00D26E0C" w:rsidRPr="00D26E0C" w:rsidRDefault="00D26E0C" w:rsidP="00D26E0C">
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="begin"/>
</w:r>
<w:r w:rsidR="00C76D57">
<w:instrText>HYPERLINK \l "_ENREF_95" \o "Kappos, 2010 #67"</w:instrText>
</w:r>
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="end"/>
</w:r>
<w:r w:rsidR="004C1AB8" w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:color w:val="auto"/>
</w:rPr>
<w:t xml:space="preserve"> </w:t>
</w:r>
</w:p>
</w:body>
</w:document>

View File

@ -1,101 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<w:document xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 w15 wp14">
<w:body>
<w:p w:rsidR="00D26E0C" w:rsidRPr="00D26E0C" w:rsidRDefault="00D26E0C" w:rsidP="00D26E0C">
<w:proofErr w:type="gramEnd"/>
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="begin"/>
</w:r>
<w:r w:rsidR="00C76D57">
<w:instrText>HYPERLINK \l "_ENREF_95" \o "Kappos, 2010 #67"</w:instrText>
</w:r>
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="separate"/>
</w:r>
<w:r w:rsidR="00C76D57" w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:color w:val="auto"/>
</w:rPr>
<w:fldChar w:fldCharType="begin">
<w:fldData xml:space="preserve">XXX</w:fldData>
</w:fldChar>
</w:r>
<w:r w:rsidR="003741F5">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:color w:val="auto"/>
</w:rPr>
<w:instrText xml:space="preserve"> ADDIN EN.CITE </w:instrText>
</w:r>
<w:r w:rsidR="00C76D57">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:color w:val="auto"/>
</w:rPr>
<w:fldChar w:fldCharType="begin">
<w:fldData xml:space="preserve">XXX</w:fldData>
</w:fldChar>
</w:r>
<w:r w:rsidR="003741F5">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:color w:val="auto"/>
</w:rPr>
<w:instrText xml:space="preserve"> ADDIN EN.CITE.DATA </w:instrText>
</w:r>
<w:r w:rsidR="00C76D57">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:color w:val="auto"/>
</w:rPr>
</w:r>
<w:r w:rsidR="00C76D57">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:color w:val="auto"/>
</w:rPr>
<w:fldChar w:fldCharType="end"/>
</w:r>
<w:r w:rsidR="00C76D57" w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:color w:val="auto"/>
</w:rPr>
</w:r>
<w:r w:rsidR="00C76D57" w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:color w:val="auto"/>
</w:rPr>
<w:fldChar w:fldCharType="separate"/>
</w:r>
<w:r w:rsidR="003741F5" w:rsidRPr="00FA3B8B">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:noProof/>
<w:color w:val="auto"/>
<w:vertAlign w:val="superscript"/>
</w:rPr>
<w:t>95-98</w:t>
</w:r>
<w:r w:rsidR="00C76D57" w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:color w:val="auto"/>
</w:rPr>
<w:fldChar w:fldCharType="end"/>
</w:r>
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="end"/>
</w:r>
<w:r w:rsidR="004C1AB8" w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:color w:val="auto"/>
</w:rPr>
<w:t xml:space="preserve"> </w:t>
</w:r>
</w:p>
</w:body>
</w:document>

View File

@ -1,38 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<w:document xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 w15 wp14">
<w:body>
<w:p w:rsidR="00D26E0C" w:rsidRPr="00D26E0C" w:rsidRDefault="00D26E0C" w:rsidP="00D26E0C">
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="begin"/>
</w:r>
<w:r w:rsidR="00C76D57">
<w:instrText>HYPERLINK \l "_ENREF_95" \o "Kappos, 2010 #67"</w:instrText>
</w:r>
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="begin"/>
</w:r>
<w:r w:rsidR="00C76D57">
<w:instrText>HYPERLINK \l "_ENREF_2" \o "Kappos, 2010 #67"</w:instrText>
</w:r>
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="separate"/>
</w:r>
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="end"/>
</w:r>
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="separate"/>
</w:r>
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="end"/>
</w:r>
<w:r w:rsidR="004C1AB8" w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:color w:val="auto"/>
</w:rPr>
<w:t xml:space="preserve"> </w:t>
</w:r>
</w:p>
</w:body>
</w:document>

View File

@ -1,38 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<w:document xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 w15 wp14">
<w:body>
<w:p w:rsidR="00D26E0C" w:rsidRPr="00D26E0C" w:rsidRDefault="00D26E0C" w:rsidP="00D26E0C">
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="begin"/>
</w:r>
<w:r w:rsidR="00C76D57">
<w:instrText>HYPERLINK \l "_ENREF_95" \o "Kappos, 2010 #67"</w:instrText>
</w:r>
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="separate"/>
</w:r>
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="begin"/>
</w:r>
<w:r w:rsidR="00C76D57">
<w:instrText>HYPERLINK \l "_ENREF_2" \o "Kappos, 2010 #67"</w:instrText>
</w:r>
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="separate"/>
</w:r>
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="end"/>
</w:r>
<w:r w:rsidR="00C76D57">
<w:fldChar w:fldCharType="end"/>
</w:r>
<w:r w:rsidR="004C1AB8" w:rsidRPr="00E63F36">
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:hAnsi="Times New Roman" w:cs="Times New Roman"/>
<w:color w:val="auto"/>
</w:rPr>
<w:t xml:space="preserve"> </w:t>
</w:r>
</w:p>
</w:body>
</w:document>

Some files were not shown because too many files have changed in this diff Show More