From c6661c92c91298a18f23213d65470001d9d4cc18 Mon Sep 17 00:00:00 2001
From: Liang Chang <l-chang@users.sourceforge.net>
Date: Wed, 12 Jan 2022 04:04:33 +0800
Subject: [PATCH] dtdocbook: merge dtinfogen into dtdocbook.

---
 cde/lib/DtSearch/lang.c                       |  57 +-
 cde/lib/DtSearch/tiny.c                       | 952 ++++++++++++++++++
 cde/lib/DtSearch/tiny.dbd                     | Bin 4372 -> 0 bytes
 cde/programs/dtdocbook/Makefile.am            |   9 +-
 cde/programs/dtdocbook/doc_utils/Makefile.am  |  71 ++
 .../dtdocbook2infolib.c}                      |  82 +-
 cde/programs/dtdocbook/dtdocbook2man.in       |   3 +-
 cde/programs/dtdocbook/dtdocbook2sdl.in       |  13 +-
 cde/programs/dtdocbook/dtsr/Makefile.am       |  34 +
 .../de_DE.UTF-8 => dtdocbook}/dtsr/deu.sfx    |   0
 .../de_DE.UTF-8 => dtdocbook}/dtsr/deu.stp    |   0
 .../{localized/C => dtdocbook}/dtsr/eng.sfx   |   0
 .../{localized/C => dtdocbook}/dtsr/eng.stp   |   0
 .../es_ES.UTF-8 => dtdocbook}/dtsr/esp.sfx    |   0
 .../es_ES.UTF-8 => dtdocbook}/dtsr/esp.stp    |   0
 .../fr_FR.UTF-8 => dtdocbook}/dtsr/fra.sfx    |   0
 .../fr_FR.UTF-8 => dtdocbook}/dtsr/fra.stp    |   0
 .../it_IT.UTF-8 => dtdocbook}/dtsr/ita.sfx    |   0
 .../it_IT.UTF-8 => dtdocbook}/dtsr/ita.stp    |   0
 cde/programs/dtdocbook/dtsr/jpn.knj           | 550 ++++++++++
 .../etc => dtdocbook/infolib}/AttributeData.C |   0
 .../etc => dtdocbook/infolib}/AttributeData.h |   0
 .../etc => dtdocbook/infolib}/AttributeList.C |   0
 .../etc => dtdocbook/infolib}/AttributeList.h |   0
 .../etc => dtdocbook/infolib}/AttributeRec.C  |   0
 .../etc => dtdocbook/infolib}/AttributeRec.h  |   0
 .../infolib}/AttributeStore.C                 |   0
 .../infolib}/AttributeStore.h                 |   0
 .../etc => dtdocbook/infolib}/AusText.C       |   0
 .../etc => dtdocbook/infolib}/AusText.h       |   0
 .../infolib}/AusTextStorage.C                 |   0
 .../infolib}/AusTextStorage.h                 |   0
 .../etc => dtdocbook/infolib}/BTCollectable.C |   0
 .../etc => dtdocbook/infolib}/BTCollectable.h |   0
 .../infolib}/BaseDataCollect.h                |   0
 .../etc => dtdocbook/infolib}/BookCaseDB.C    |   0
 .../etc => dtdocbook/infolib}/BookCaseDB.h    |   0
 .../etc => dtdocbook/infolib}/BookTasks.C     |   0
 .../etc => dtdocbook/infolib}/BookTasks.h     |   0
 .../infolib}/ChangeCaseTitle                  |   0
 .../etc => dtdocbook/infolib}/ConcatTask.C    |   0
 .../etc => dtdocbook/infolib}/ConcatTask.h    |   0
 .../etc => dtdocbook/infolib}/Content.C       |   0
 .../etc => dtdocbook/infolib}/Content.h       |   0
 .../etc => dtdocbook/infolib}/ContentRec.h    |   0
 .../etc => dtdocbook/infolib}/ContentType.h   |   0
 .../etc => dtdocbook/infolib}/ContentType.ll  |   0
 .../etc => dtdocbook/infolib}/DataBase.C      |   0
 .../etc => dtdocbook/infolib}/DataBase.h      |   0
 .../infolib}/DataRepository.C                 |   0
 .../infolib}/DataRepository.h                 |   0
 .../etc => dtdocbook/infolib}/DataTask.C      |   0
 .../etc => dtdocbook/infolib}/DataTask.h      |   0
 .../infolib}/DeInstallBase                    |   0
 .../etc => dtdocbook/infolib}/Dispatch.C      |   0
 .../etc => dtdocbook/infolib}/Dispatch.h      |   0
 .../etc => dtdocbook/infolib}/EntityList.C    |   0
 .../etc => dtdocbook/infolib}/EntityList.h    |   0
 .../etc => dtdocbook/infolib}/EntityScope.h   |   0
 .../etc => dtdocbook/infolib}/ExprList.C      |   0
 .../etc => dtdocbook/infolib}/ExprList.h      |   0
 .../etc => dtdocbook/infolib}/Expression.C    |   0
 .../etc => dtdocbook/infolib}/Expression.h    |   0
 .../etc => dtdocbook/infolib}/FirstOf.C       |   0
 .../etc => dtdocbook/infolib}/FirstOf.h       |   0
 .../etc => dtdocbook/infolib}/FlexBuffer.C    |   0
 .../etc => dtdocbook/infolib}/FlexBuffer.h    |   0
 .../etc => dtdocbook/infolib}/GenericId.C     |   0
 .../etc => dtdocbook/infolib}/GenericId.h     |   0
 .../etc => dtdocbook/infolib}/GraphicsTask.C  |   0
 .../etc => dtdocbook/infolib}/GraphicsTask.h  |   0
 .../etc => dtdocbook/infolib}/Handler.C       |   0
 .../etc => dtdocbook/infolib}/Handler.h       |   0
 .../install => dtdocbook/infolib}/InstallBase |   0
 .../etc => dtdocbook/infolib}/LcfTask.C       |   0
 .../etc => dtdocbook/infolib}/LcfTask.h       |   0
 .../install => dtdocbook/infolib}/Librarian   |   0
 .../etc => dtdocbook/infolib}/Literal.h       |   0
 cde/programs/dtdocbook/infolib/Makefile.am    | 154 +++
 .../etc => dtdocbook/infolib}/MixedGen.C      |   0
 .../etc => dtdocbook/infolib}/NCFGen.C        |   0
 .../etc => dtdocbook/infolib}/NodeData.C      |   0
 .../etc => dtdocbook/infolib}/NodeData.h      |   0
 .../etc => dtdocbook/infolib}/NodeParser.C    |   0
 .../etc => dtdocbook/infolib}/NodeTask.C      |   0
 .../etc => dtdocbook/infolib}/NodeTask.h      |   0
 .../infolib/etc => dtdocbook/infolib}/OLAF.C  |   0
 .../infolib/etc => dtdocbook/infolib}/OLAF.h  |   0
 .../etc => dtdocbook/infolib}/OL_Data.C       |   0
 .../etc => dtdocbook/infolib}/OL_Data.h       |   0
 .../etc => dtdocbook/infolib}/OL_DataExpr.yy  |   0
 .../etc => dtdocbook/infolib}/RemoteId.ll     |   0
 .../infolib}/ReplaceIdIdref.ll                |   0
 .../etc => dtdocbook/infolib}/SGMLDefn.C      |   0
 .../etc => dtdocbook/infolib}/SGMLDefn.h      |   0
 .../etc => dtdocbook/infolib}/SGMLName.C      |   0
 .../etc => dtdocbook/infolib}/SGMLName.h      |   0
 .../etc => dtdocbook/infolib}/SearchEng.C     |   0
 .../etc => dtdocbook/infolib}/SearchEng.h     |   0
 .../etc => dtdocbook/infolib}/SearchPath.C    |   0
 .../etc => dtdocbook/infolib}/SearchPath.h    |   0
 .../etc => dtdocbook/infolib}/SearchStorage.C |   0
 .../etc => dtdocbook/infolib}/SearchStorage.h |   0
 .../infolib/etc => dtdocbook/infolib}/Stack.h |   0
 .../etc => dtdocbook/infolib}/StringList.C    |   0
 .../etc => dtdocbook/infolib}/StringList.h    |   0
 .../etc => dtdocbook/infolib}/StyleTask.C     |   0
 .../etc => dtdocbook/infolib}/StyleTask.h     |   0
 .../etc => dtdocbook/infolib}/StyleTaskDB.C   |   0
 .../etc => dtdocbook/infolib}/StyleUpdate.C   |   0
 .../etc => dtdocbook/infolib}/StyleValidate.C |   0
 .../etc => dtdocbook/infolib}/StyleValidate.h |   0
 .../etc => dtdocbook/infolib}/TKTemplate.C    |   0
 .../etc => dtdocbook/infolib}/TOCTask.C       |   0
 .../etc => dtdocbook/infolib}/TOCTask.h       |   0
 .../etc => dtdocbook/infolib}/TableTask.C     |   0
 .../etc => dtdocbook/infolib}/TableTask.h     |   0
 .../infolib/etc => dtdocbook/infolib}/Task.C  |   0
 .../infolib/etc => dtdocbook/infolib}/Task.h  |   0
 .../infolib/etc => dtdocbook/infolib}/Token.C |   0
 .../infolib/etc => dtdocbook/infolib}/Token.h |   0
 .../etc => dtdocbook/infolib}/dataflow.doc    | Bin
 .../src/main.C => dtdocbook/infolib/dbdrv.C}  |   7 +-
 .../etc => dtdocbook/infolib}/gr_type.ll      |   0
 .../infolib/etc => dtdocbook/infolib}/lex.ll  |   0
 .../src => dtdocbook/infolib}/main_c_api.c    |   0
 .../infolib}/relational-design                | Bin
 .../mmdb/src => dtdocbook/infolib}/restore.C  |   0
 .../install => dtdocbook/infolib}/valBase.C   |   0
 .../infolib}/validator.C                      |   9 +-
 cde/programs/dtdocbook/sgml/Makefile.am       |   3 +-
 .../dtdocbook/sgml/examples/docbook.sty       |  10 +-
 cde/programs/dtdocbook/sgml/styprolog.sgml    |  23 +
 cde/programs/dtdocbook/spec/Makefile.am       |   7 +
 .../spec}/hardcopy.feature.spec               |   0
 .../spec}/mmdb.infolib.spec                   |   0
 .../spec}/online.feature.spec                 |   0
 cde/programs/dtdocbook/tcl/docbook.tcl        |  21 +-
 .../dtinfo/DtMmdb/StyleSheet/Makefile.am      |   3 -
 .../dtinfo/DtMmdb/oliasdb/Makefile.am         |   3 -
 cde/programs/dtinfo/dtinfogen/Imakefile       |  22 -
 cde/programs/dtinfo/dtinfogen/Makefile.am     |   3 -
 .../dtinfo/dtinfogen/global/olGlobal.h        |  60 --
 .../infolib/C.ISO-8859-1/Makefile.am          |   3 -
 .../infolib/C.ISO-8859-1/SGML/Makefile.am     |  46 -
 .../dtinfo/dtinfogen/infolib/Makefile.am      |  13 -
 .../dtinfo/dtinfogen/infolib/etc/Imakefile    | 385 -------
 .../dtinfo/dtinfogen/infolib/etc/Makefile.am  |  88 --
 .../dtinfo/dtinfogen/infolib/etc/all_tmpls    |   2 -
 .../dtinfo/dtinfogen/infolib/etc/dtinfogen    | 372 -------
 .../infolib/ja_JP.EUC-JP/Makefile.am          |   3 -
 .../dtinfo/dtinfogen/install/Imakefile        | 225 -----
 .../dtinfo/dtinfogen/install/Makefile.am      |  14 -
 cde/programs/dtinfo/dtinfogen/mmdb/Imakefile  |  22 -
 .../dtinfo/dtinfogen/mmdb/Makefile.am         |   3 -
 .../dtinfogen/mmdb/StyleSheet/Imakefile       | 203 ----
 .../dtinfogen/mmdb/StyleSheet/Makefile.am     |  12 -
 .../dtinfo/dtinfogen/mmdb/src/Imakefile       | 212 ----
 .../dtinfo/dtinfogen/mmdb/src/Makefile.am     |  25 -
 cde/programs/dtsr/dtsearch.dbd                | Bin 4372 -> 0 bytes
 .../localized/ja_JP.dt-eucJP/dtsr/jpn.knj     | 550 ----------
 161 files changed, 1884 insertions(+), 2390 deletions(-)
 create mode 100644 cde/lib/DtSearch/tiny.c
 delete mode 100644 cde/lib/DtSearch/tiny.dbd
 create mode 100644 cde/programs/dtdocbook/doc_utils/Makefile.am
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c => dtdocbook/dtdocbook2infolib.c} (95%)
 create mode 100644 cde/programs/dtdocbook/dtsr/Makefile.am
 rename cde/programs/{localized/de_DE.UTF-8 => dtdocbook}/dtsr/deu.sfx (100%)
 rename cde/programs/{localized/de_DE.UTF-8 => dtdocbook}/dtsr/deu.stp (100%)
 rename cde/programs/{localized/C => dtdocbook}/dtsr/eng.sfx (100%)
 rename cde/programs/{localized/C => dtdocbook}/dtsr/eng.stp (100%)
 rename cde/programs/{localized/es_ES.UTF-8 => dtdocbook}/dtsr/esp.sfx (100%)
 rename cde/programs/{localized/es_ES.UTF-8 => dtdocbook}/dtsr/esp.stp (100%)
 rename cde/programs/{localized/fr_FR.UTF-8 => dtdocbook}/dtsr/fra.sfx (100%)
 rename cde/programs/{localized/fr_FR.UTF-8 => dtdocbook}/dtsr/fra.stp (100%)
 rename cde/programs/{localized/it_IT.UTF-8 => dtdocbook}/dtsr/ita.sfx (100%)
 rename cde/programs/{localized/it_IT.UTF-8 => dtdocbook}/dtsr/ita.stp (100%)
 create mode 100644 cde/programs/dtdocbook/dtsr/jpn.knj
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/AttributeData.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/AttributeData.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/AttributeList.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/AttributeList.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/AttributeRec.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/AttributeRec.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/AttributeStore.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/AttributeStore.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/AusText.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/AusText.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/AusTextStorage.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/AusTextStorage.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/BTCollectable.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/BTCollectable.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/BaseDataCollect.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/BookCaseDB.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/BookCaseDB.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/BookTasks.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/BookTasks.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/install => dtdocbook/infolib}/ChangeCaseTitle (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/ConcatTask.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/ConcatTask.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/Content.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/Content.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/ContentRec.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/ContentType.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/ContentType.ll (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/DataBase.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/DataBase.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/DataRepository.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/DataRepository.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/DataTask.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/DataTask.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/install => dtdocbook/infolib}/DeInstallBase (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/Dispatch.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/Dispatch.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/EntityList.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/EntityList.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/EntityScope.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/ExprList.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/ExprList.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/Expression.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/Expression.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/FirstOf.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/FirstOf.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/FlexBuffer.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/FlexBuffer.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/GenericId.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/GenericId.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/GraphicsTask.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/GraphicsTask.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/Handler.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/Handler.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/install => dtdocbook/infolib}/InstallBase (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/LcfTask.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/LcfTask.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/install => dtdocbook/infolib}/Librarian (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/Literal.h (100%)
 create mode 100644 cde/programs/dtdocbook/infolib/Makefile.am
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/MixedGen.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/NCFGen.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/NodeData.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/NodeData.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/NodeParser.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/NodeTask.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/NodeTask.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/OLAF.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/OLAF.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/OL_Data.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/OL_Data.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/OL_DataExpr.yy (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/RemoteId.ll (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/ReplaceIdIdref.ll (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/SGMLDefn.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/SGMLDefn.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/SGMLName.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/SGMLName.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/SearchEng.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/SearchEng.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/SearchPath.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/SearchPath.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/SearchStorage.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/SearchStorage.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/Stack.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/StringList.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/StringList.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/StyleTask.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/StyleTask.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/StyleTaskDB.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/StyleUpdate.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/StyleValidate.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/StyleValidate.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/TKTemplate.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/TOCTask.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/TOCTask.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/TableTask.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/TableTask.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/Task.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/Task.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/Token.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/Token.h (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/dataflow.doc (100%)
 rename cde/programs/{dtinfo/dtinfogen/mmdb/src/main.C => dtdocbook/infolib/dbdrv.C} (97%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/gr_type.ll (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/lex.ll (100%)
 rename cde/programs/{dtinfo/dtinfogen/mmdb/src => dtdocbook/infolib}/main_c_api.c (100%)
 rename cde/programs/{dtinfo/dtinfogen/infolib/etc => dtdocbook/infolib}/relational-design (100%)
 rename cde/programs/{dtinfo/dtinfogen/mmdb/src => dtdocbook/infolib}/restore.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/install => dtdocbook/infolib}/valBase.C (100%)
 rename cde/programs/{dtinfo/dtinfogen/mmdb/StyleSheet => dtdocbook/infolib}/validator.C (94%)
 create mode 100644 cde/programs/dtdocbook/sgml/styprolog.sgml
 create mode 100644 cde/programs/dtdocbook/spec/Makefile.am
 rename cde/programs/{dtinfo/DtMmdb/StyleSheet => dtdocbook/spec}/hardcopy.feature.spec (100%)
 rename cde/programs/{dtinfo/DtMmdb/oliasdb => dtdocbook/spec}/mmdb.infolib.spec (100%)
 rename cde/programs/{dtinfo/DtMmdb/StyleSheet => dtdocbook/spec}/online.feature.spec (100%)
 delete mode 100644 cde/programs/dtinfo/dtinfogen/Imakefile
 delete mode 100644 cde/programs/dtinfo/dtinfogen/Makefile.am
 delete mode 100644 cde/programs/dtinfo/dtinfogen/global/olGlobal.h
 delete mode 100644 cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/Makefile.am
 delete mode 100644 cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/Makefile.am
 delete mode 100644 cde/programs/dtinfo/dtinfogen/infolib/Makefile.am
 delete mode 100644 cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile
 delete mode 100644 cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am
 delete mode 100644 cde/programs/dtinfo/dtinfogen/infolib/etc/all_tmpls
 delete mode 100755 cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen
 delete mode 100644 cde/programs/dtinfo/dtinfogen/infolib/ja_JP.EUC-JP/Makefile.am
 delete mode 100644 cde/programs/dtinfo/dtinfogen/install/Imakefile
 delete mode 100644 cde/programs/dtinfo/dtinfogen/install/Makefile.am
 delete mode 100644 cde/programs/dtinfo/dtinfogen/mmdb/Imakefile
 delete mode 100644 cde/programs/dtinfo/dtinfogen/mmdb/Makefile.am
 delete mode 100644 cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Imakefile
 delete mode 100644 cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Makefile.am
 delete mode 100644 cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile
 delete mode 100644 cde/programs/dtinfo/dtinfogen/mmdb/src/Makefile.am
 delete mode 100644 cde/programs/dtsr/dtsearch.dbd
 delete mode 100644 cde/programs/localized/ja_JP.dt-eucJP/dtsr/jpn.knj

diff --git a/cde/lib/DtSearch/lang.c b/cde/lib/DtSearch/lang.c
index 10ce6db0a..fcf319945 100644
--- a/cde/lib/DtSearch/lang.c
+++ b/cde/lib/DtSearch/lang.c
@@ -264,18 +264,22 @@ static int	search_wordtree (WORDTREE *wordtree, char *wordstring)
 
 static int euro_mbtowc (wchar_t *pwc, const char *p, const char *s)
 {
-    int len;
+    int len = -1;
 
-    mbtowc (NULL, NULL, 0);
-    len = mbtowc (pwc, p, 1);
+    if (p < s) goto done;
 
-    if (len < 0 && p > s) {
-	mbtowc (NULL, NULL, 0);
-	len = mbtowc (pwc, p - 1, 2);
+    if (*p >= 0 && *p <= 0x7F) {
+	len = 1;
+	*pwc = *p;
+	goto done;
     }
 
-    if (len < 0 || *pwc > 0xFF) *pwc = 0x100;
+    if (p == s) goto done;
 
+    mbtowc (NULL, NULL, 0); len = mbtowc (pwc, p - 1, 2);
+
+done:
+    if (len < 0 || *pwc > 0xFF) *pwc = 0x100;
     return len;
 }
 
@@ -294,25 +298,26 @@ static int euro_readchar (READCFP cofunction, void *cofunction_arg, char *outp,
 {
     int len = 1;
 
-    *pwc = 0;
+    *pwc = *outp = cofunction (cofunction_arg);
 
-    *outp = cofunction (cofunction_arg);
+    if (*pwc >= 0 && *pwc <= 0x7F) goto done;
 
-    if (!(*outp)) goto done;
+    *(outp + len) = cofunction (NULL);
 
-    mbtowc (NULL, NULL, 0);
+    mbtowc (NULL, NULL, 0); if (mbtowc (pwc, outp, ++len) >= 0) goto done;
 
-    if (mbtowc (pwc, outp, 1) >= 0) goto done;
+    *pwc = 0x100;
 
-    *(outp + 1) = cofunction (NULL);
-    mbtowc (NULL, NULL, 0);
-    len = mbtowc (pwc, outp, 2);
+    for (;;) {
+	if (len >= MB_CUR_MAX) break;
 
-    if (len < 0 || *pwc > 0xFF) *pwc = 0x100;
+	*(outp + len) = cofunction (NULL);
 
-    len = 2;
+	mblen (NULL, 0); if (mblen (outp, ++len) >= 0) break;
+    }
 
 done:
+    if (*pwc > 0xFF) *pwc = 0x100;
     return len;
 }
 
@@ -381,7 +386,7 @@ char	*teskey_parser (PARG *parg)
     static long		*offsetp, readcount, candidate_offset;
     static int		is_hiliting;
     static int		add_msgs;
-    static int		len;
+    static int		len, opt_len;
     static wchar_t	wc;
 
     /* If first call for current text block... */
@@ -470,12 +475,13 @@ READ_ANOTHER_WORD:
 	     * Otherwise discard just like non_concord.
 	     */
 	    outp += len;
-	    len = euro_readchar (cofunction, NULL, outp, &wc);
-	    readcount += len;
+	    opt_len = euro_readchar (cofunction, NULL, outp, &wc);
+
+	    if (wc) readcount += opt_len;
 
 	    if ((charmap[wc] & CONCORDABLE) != 0) {
-		outp = euro_wctomb (charmap[wc], outp, len);
-		candidate_offset = readcount - len;
+		outp = euro_wctomb (charmap[wc], outp, opt_len);
+		candidate_offset = readcount - opt_len;
 		tpstate = IN_WORD;
 		continue;
 	    }
@@ -524,12 +530,13 @@ READ_ANOTHER_WORD:
 	    }
 	    /* Must be opt_concord... */
 	    outp += len;
-	    len = euro_readchar (cofunction, NULL, outp, &wc);
-	    readcount += len;
+	    opt_len = euro_readchar (cofunction, NULL, outp, &wc);
+
+	    if (wc) readcount += opt_len;
 
 	    if ((charmap[wc] & CONCORDABLE) != 0) {
 		if (outp < endmaxword) {
-		    outp = euro_wctomb (charmap[wc], outp, len);
+		    outp = euro_wctomb (charmap[wc], outp, opt_len);
 		}
 		else {
 		    tpstate = TOO_LONG;
diff --git a/cde/lib/DtSearch/tiny.c b/cde/lib/DtSearch/tiny.c
new file mode 100644
index 000000000..d2c9c24ab
--- /dev/null
+++ b/cde/lib/DtSearch/tiny.c
@@ -0,0 +1,952 @@
+/*
+ * CDE - Common Desktop Environment
+ *
+ * (c) Copyright 1993-2012 The Open Group
+ * (c) Copyright 2012-2022 CDE Project contributors, see
+ * CONTRIBUTORS for details
+ *
+ * These libraries and programs are free software; you can
+ * redistribute them and/or modify them under the terms of the GNU
+ * Lesser General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * These libraries and programs are distributed in the hope that
+ * they will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with these libraries and programs; if not, write
+ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdio.h>
+#include "vista.h"
+#include "dbtype.h"
+#include "dbswab.h"
+
+#ifndef BASE_FILE_NAME
+#define BASE_FILE_NAME "tiny"
+#endif
+
+#define DBD_MAP_SIZE 8
+
+#define PAGE_SIZE		4096
+#define FILE_TABLE_SIZE		10
+#define RECORD_TABLE_SIZE	8
+#define FIELD_TABLE_SIZE	49
+#define SET_TABLE_SIZE		3
+#define MEMBER_TABLE_SIZE	3
+#define SORT_TABLE_SIZE		0
+#define KEY_TABLE_SIZE		0
+
+int main(void) {
+    fwrite(dbd_VERSION, DBD_COMPAT_LEN, 1, stdout);
+
+    INT dbd_map[DBD_MAP_SIZE] = {
+	PAGE_SIZE,
+	FILE_TABLE_SIZE,
+	RECORD_TABLE_SIZE,
+	FIELD_TABLE_SIZE,
+	SET_TABLE_SIZE,
+	MEMBER_TABLE_SIZE,
+	SORT_TABLE_SIZE,
+	KEY_TABLE_SIZE
+    };
+
+    for (int i = 0; i < DBD_MAP_SIZE; ++i) HTONS(dbd_map[i]);
+
+    fwrite(dbd_map, sizeof(INT), DBD_MAP_SIZE, stdout);
+
+    FILE_ENTRY file_entry[FILE_TABLE_SIZE] = {
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= DATA,
+	    .ft_slots	= 0x20,
+	    .ft_slsize	= 0x7E,
+	    .ft_pgsize	= 0x1000,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= DATA,
+	    .ft_slots	= 0x8,
+	    .ft_slsize	= 0xFE,
+	    .ft_pgsize	= 0x800,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= DATA,
+	    .ft_slots	= 0x3C,
+	    .ft_slsize	= 0x22,
+	    .ft_pgsize	= 0x800,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= DATA,
+	    .ft_slots	= 0x23,
+	    .ft_slsize	= 0x3A,
+	    .ft_pgsize	= 0x800,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= DATA,
+	    .ft_slots	= 0x6,
+	    .ft_slsize	= 0x9A,
+	    .ft_pgsize	= 0x400,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= KEY,
+	    .ft_slots	= 0x30,
+	    .ft_slsize	= 0x2A,
+	    .ft_pgsize	= 0x800,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= KEY,
+	    .ft_slots	= 0x11,
+	    .ft_slsize	= 0x74,
+	    .ft_pgsize	= 0x800,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= KEY,
+	    .ft_slots	= 0x4E,
+	    .ft_slsize	= 0x1A,
+	    .ft_pgsize	= 0x800,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= KEY,
+	    .ft_slots	= 0x28,
+	    .ft_slsize	= 0x32,
+	    .ft_pgsize	= 0x800,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= KEY,
+	    .ft_slots	= 0x7,
+	    .ft_slsize	= 0x90,
+	    .ft_pgsize	= 0x400,
+	    .ft_flags	= 0
+	}
+    };
+
+    snprintf(file_entry[0].ft_name, FILENMLEN, "%s.d00", BASE_FILE_NAME);
+    snprintf(file_entry[1].ft_name, FILENMLEN, "%s.d01", BASE_FILE_NAME);
+    snprintf(file_entry[2].ft_name, FILENMLEN, "%s.d21", BASE_FILE_NAME);
+    snprintf(file_entry[3].ft_name, FILENMLEN, "%s.d22", BASE_FILE_NAME);
+    snprintf(file_entry[4].ft_name, FILENMLEN, "%s.d23", BASE_FILE_NAME);
+    snprintf(file_entry[5].ft_name, FILENMLEN, "%s.k00", BASE_FILE_NAME);
+    snprintf(file_entry[6].ft_name, FILENMLEN, "%s.k01", BASE_FILE_NAME);
+    snprintf(file_entry[7].ft_name, FILENMLEN, "%s.k21", BASE_FILE_NAME);
+    snprintf(file_entry[8].ft_name, FILENMLEN, "%s.k22", BASE_FILE_NAME);
+    snprintf(file_entry[9].ft_name, FILENMLEN, "%s.k23", BASE_FILE_NAME);
+
+    for (int i = 0; i < FILE_TABLE_SIZE; ++i) {
+	FILE_ENTRY *p = &file_entry[i];
+
+	HTONS(p->ft_desc);
+	HTONS(p->ft_slots);
+	HTONS(p->ft_slsize);
+	HTONS(p->ft_pgsize);
+	HTONS(p->ft_flags);
+    }
+
+    fwrite(file_entry, sizeof(FILE_ENTRY), FILE_TABLE_SIZE, stdout);
+
+    RECORD_ENTRY record_entry[RECORD_TABLE_SIZE] = {
+	{
+	    .rt_file	= 0,
+	    .rt_len	= 0x7E,
+	    .rt_data	= 0x12,
+	    .rt_fields	= 0,
+	    .rt_fdtot	= 0x13,
+	    .rt_flags	= 0
+	},
+	{
+	    .rt_file	= 0,
+	    .rt_len	= 0x7E,
+	    .rt_data	= 0x12,
+	    .rt_fields	= 0x13,
+	    .rt_fdtot	= 0x2,
+	    .rt_flags	= 0
+	},
+	{
+	    .rt_file	= 0,
+	    .rt_len	= 0x7E,
+	    .rt_data	= 0x1E,
+	    .rt_fields	= 0x15,
+	    .rt_fdtot	= 0xC,
+	    .rt_flags	= 0
+	},
+	{
+	    .rt_file	= 0,
+	    .rt_len	= 0x7E,
+	    .rt_data	= 0x13,
+	    .rt_fields	= 0x21,
+	    .rt_fdtot	= 0x2,
+	    .rt_flags	= 0
+	},
+	{
+	    .rt_file	= 0x1,
+	    .rt_len	= 0xFE,
+	    .rt_data	= 0x12,
+	    .rt_fields	= 0x23,
+	    .rt_fdtot	= 0x2,
+	    .rt_flags	= 0
+	},
+	{
+	    .rt_file	= 0x2,
+	    .rt_len	= 0x22,
+	    .rt_data	= 0x6,
+	    .rt_fields	= 0x25,
+	    .rt_fdtot	= 0x4,
+	    .rt_flags	= 0
+	},
+	{
+	    .rt_file	= 0x3,
+	    .rt_len	= 0x3A,
+	    .rt_data	= 0x6,
+	    .rt_fields	= 0x29,
+	    .rt_fdtot	= 0x4,
+	    .rt_flags	= 0
+	},
+	{
+	    .rt_file	= 0x4,
+	    .rt_len	= 0x9A,
+	    .rt_data	= 0x6,
+	    .rt_fields	= 0x2D,
+	    .rt_fdtot	= 0x4,
+	    .rt_flags	= 0
+	}
+    };
+
+    for (int i = 0; i < RECORD_TABLE_SIZE; ++i) {
+	RECORD_ENTRY *p = &record_entry[i];
+
+	HTONS(p->rt_file);
+	HTONS(p->rt_len);
+	HTONS(p->rt_data);
+	HTONS(p->rt_fields);
+	HTONS(p->rt_fdtot);
+	HTONS(p->rt_flags);
+    }
+
+    fwrite(record_entry, sizeof(RECORD_ENTRY), RECORD_TABLE_SIZE, stdout);
+
+    FIELD_ENTRY field_entry[FIELD_TABLE_SIZE] = {
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x12,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0x4
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x16,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0x4
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x1A,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x1E,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x22,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x26,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x2A,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x2E,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x8,
+	    .fd_dim	= {0x8, 0, 0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x32,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x32,
+	    .fd_dim	= {0x32, 0, 0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x3A,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x6C,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x6E,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x70,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x72,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x74,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x76,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x78,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x7A,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x7C,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x12,
+	    .fd_rec	= 0x1,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x6A,
+	    .fd_dim	= {0x1, 0x6A, 0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x14,
+	    .fd_rec	= 0x1,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x1E,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0x4
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x22,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0x4
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x26,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x2A,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x2E,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= UNIQUE,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x20,
+	    .fd_dim	= {0x20, 0, 0},
+	    .fd_keyfile	= 0x5,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x32,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x22,
+	    .fd_dim	= {0x22, 0, 0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x52,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x74,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x76,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x78,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x7A,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x7C,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x13,
+	    .fd_rec	= 0x3,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= DUPLICATES,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x69,
+	    .fd_dim	= {0x1, 0x69, 0},
+	    .fd_keyfile	= 0x6,
+	    .fd_keyno	= 0x1,
+	    .fd_ptr	= 0x15,
+	    .fd_rec	= 0x3,
+	    .fd_flags	= 0x400
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x12,
+	    .fd_rec	= 0x4,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0xEA,
+	    .fd_dim	= {0xEA, 0x1, 0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x14,
+	    .fd_rec	= 0x4,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= UNIQUE,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x10,
+	    .fd_dim	= {0x10, 0, 0},
+	    .fd_keyfile	= 0x7,
+	    .fd_keyno	= 0x2,
+	    .fd_ptr	= 0x6,
+	    .fd_rec	= 0x5,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x16,
+	    .fd_rec	= 0x5,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x1A,
+	    .fd_rec	= 0x5,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x1E,
+	    .fd_rec	= 0x5,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= UNIQUE,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x28,
+	    .fd_dim	= {0x28, 0, 0},
+	    .fd_keyfile	= 0x8,
+	    .fd_keyno	= 0x3,
+	    .fd_ptr	= 0x6,
+	    .fd_rec	= 0x6,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x2E,
+	    .fd_rec	= 0x6,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x32,
+	    .fd_rec	= 0x6,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x36,
+	    .fd_rec	= 0x6,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= UNIQUE,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x86,
+	    .fd_dim	= {0x86, 0, 0},
+	    .fd_keyfile	= 0x9,
+	    .fd_keyno	= 0x4,
+	    .fd_ptr	= 0x6,
+	    .fd_rec	= 0x7,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x8E,
+	    .fd_rec	= 0x7,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x92,
+	    .fd_rec	= 0x7,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x96,
+	    .fd_rec	= 0x7,
+	    .fd_flags	= 0x0
+	}
+    };
+
+    for (int i = 0; i < FIELD_TABLE_SIZE; ++i) {
+	FIELD_ENTRY *p = &field_entry[i];
+
+	HTONS(p->fd_len);
+	HTONS(p->fd_keyfile);
+	HTONS(p->fd_keyno);
+	HTONS(p->fd_ptr);
+	HTONS(p->fd_rec);
+	HTONS(p->fd_flags);
+
+	for (int j = 0; j < MAXDIMS; ++j) HTONS(p->fd_dim[j]);
+    }
+
+    fwrite(field_entry, sizeof(FIELD_ENTRY), FIELD_TABLE_SIZE, stdout);
+
+    SET_ENTRY set_entry[SET_TABLE_SIZE] = {
+	{
+	    .st_order	= LAST,
+	    .st_own_rt	= 0,
+	    .st_own_ptr	= 0x6,
+	    .st_members	= 0,
+	    .st_memtot	= 0x1,
+	    .st_flags	= 0
+	},
+	{
+	    .st_order	= LAST,
+	    .st_own_rt	= 0x2,
+	    .st_own_ptr	= 0x6,
+	    .st_members	= 0x1,
+	    .st_memtot	= 0x1,
+	    .st_flags	= 0
+	},
+	{
+	    .st_order	= LAST,
+	    .st_own_rt	= 0x2,
+	    .st_own_ptr	= 0x12,
+	    .st_members	= 0x2,
+	    .st_memtot	= 0x1,
+	    .st_flags	= 0
+	}
+    };
+
+    for (int i = 0; i < SET_TABLE_SIZE; ++i) {
+	SET_ENTRY *p = &set_entry[i];
+
+	HTONS(p->st_order);
+	HTONS(p->st_own_rt);
+	HTONS(p->st_own_ptr);
+	HTONS(p->st_members);
+	HTONS(p->st_memtot);
+	HTONS(p->st_flags);
+    }
+
+    fwrite(set_entry, sizeof(SET_ENTRY), SET_TABLE_SIZE, stdout);
+
+    MEMBER_ENTRY member_entry[MEMBER_TABLE_SIZE] = {
+	{
+	    .mt_record		= 0x1,
+	    .mt_mem_ptr		= 0x6,
+	    .mt_sort_fld	= 0,
+	    .mt_totsf		= 0
+	},
+	{
+	    .mt_record		= 0x4,
+	    .mt_mem_ptr		= 0x6,
+	    .mt_sort_fld	= 0,
+	    .mt_totsf		= 0
+	},
+	{
+	    .mt_record		= 0x3,
+	    .mt_mem_ptr		= 0x7,
+	    .mt_sort_fld	= 0,
+	    .mt_totsf		= 0
+	}
+    };
+
+    for (int i = 0; i < MEMBER_TABLE_SIZE; ++i) {
+	MEMBER_ENTRY *p = &member_entry[i];
+
+	HTONS(p->mt_record);
+	HTONS(p->mt_mem_ptr);
+	HTONS(p->mt_sort_fld);
+	HTONS(p->mt_totsf);
+    }
+
+    fwrite(member_entry, sizeof(MEMBER_ENTRY), MEMBER_TABLE_SIZE, stdout);
+
+    fprintf(stdout,
+	"OR_DBREC\n"
+	"OR_DBMISCREC\n"
+	"OR_OBJREC\n"
+	"OR_MISCREC\n"
+	"OR_BLOBREC\n"
+	"OR_SWORDREC\n"
+	"OR_LWORDREC\n"
+	"OR_HWORDREC\n"
+	"OR_DBFLAGS\n"
+	"OR_DBUFLAGS\n"
+	"OR_RECCOUNT\n"
+	"OR_MAXDBA\n"
+	"OR_AVAILD99\n"
+	"OR_UNAVAILD99\n"
+	"OR_HUFID\n"
+	"OR_DBSECMASK\n"
+	"OR_VERSION\n"
+	"OR_DBFILL\n"
+	"OR_DBOTYPE\n"
+	"OR_COMPFLAGS\n"
+	"OR_DBACCESS\n"
+	"OR_MINWORDSZ\n"
+	"OR_MAXWORDSZ\n"
+	"OR_RECSLOTS\n"
+	"OR_FZKEYSZ\n"
+	"OR_ABSTRSZ\n"
+	"OR_LANGUAGE\n"
+	"OR_DBMISCTYPE\n"
+	"OR_DBMISC\n"
+	"OR_OBJFLAGS\n"
+	"OR_OBJUFLAGS\n"
+	"OR_OBJSIZE\n"
+	"OR_OBJDATE\n"
+	"OR_OBJSECMASK\n"
+	"OR_OBJKEY\n"
+	"OR_OBJFILL\n"
+	"OR_OBJACCESS\n"
+	"OR_OBJTYPE\n"
+	"OR_OBJCOST\n"
+	"OR_OBJHDROFFSET\n"
+	"OR_OBJEUREKA\n"
+	"OR_MISCTYPE\n"
+	"OR_MISC\n"
+	"OR_BLOBLEN\n"
+	"OR_BLOB\n"
+	"OR_SWORDKEY\n"
+	"OR_SWOFFSET\n"
+	"OR_SWFREE\n"
+	"OR_SWADDRS\n"
+	"OR_LWORDKEY\n"
+	"OR_LWOFFSET\n"
+	"OR_LWFREE\n"
+	"OR_LWADDRS\n"
+	"OR_HWORDKEY\n"
+	"OR_HWOFFSET\n"
+	"OR_HWFREE\n"
+	"OR_HWADDRS\n"
+	"OR_DB_MISCS\n"
+	"OR_OBJ_BLOBS\n"
+	"OR_OBJ_MISCS\n");
+
+    return 0;
+}
diff --git a/cde/lib/DtSearch/tiny.dbd b/cde/lib/DtSearch/tiny.dbd
deleted file mode 100644
index 7adf0d5e4994da0a96f6334d992d52cc4a57171a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4372
zcmd^?O-~w86owB%k(w^7s0$XvVrr~O31ZSj)6IM#)PXT`L8}`V!$vWrX{oWsxa_iN
zy6D26*dJl~o--eellu?m-h_GYGiT1%y-eU_uQ{I8mWh_ALc3JN#F$-9e>BIf7VCVB
zU`!kIfIh^v@8+X!t`fCZ=&6#_-p*I;AE}Y5y`8Il-=u?7?R&YZy-bg#_{>jo^{$&x
zi*}NIpS1GyeV@>4n$2s^)w^y&1FEHJ&(phZLfh0%)t;w!-GmnDH^1vJ9%u!h)kIfm
zA<}hPqgRox(i`CgdV>9?=mly}ncfmRD$)V;JJBV2gnrL@dM!kp;DaNTGHhMLYWzUP
zuC8GX4cpSN9Sv&=3-C*a4?#HO{7(aFW5(lv#q?X$m5^R**i^&5XxLW`n`zjMhTUq|
zorc|O*a{U;M?hD&Uh#d5RbkKfsE$grd(_adE$&EWk9IVy$?SW8U(*{B^94TJVi(~2
z$PNnkg+1@{Ov7$8>{i3>H0)l(s{9XU9MC0tafwXIxUNyLl-=_cInM$8!$c=#tTIDw
z%a}YC;lE6%Fw>WH4XbHbof-UXWAdmVw=!ndUsJ={8uo!1{Qbn_@e=u#k!9B3FAe*n
zVSkwspMLn2E?i5+g+#Al&D|-81-|XkwJ1-L=U>>S?^sJB`aNYu3(x!%sT4F_FE&=E
zo^MAMZc2Ak+BQ3`ai~JyqeSB=%Nq@b%=^Y?+ca1iCq~b;_xD+k2I*CI)aluw6XjTa
zLmlzr#PL<n8-%>mbKOvR!?R<DrRDXHlaPpES&oua`n>_?sLt66@#hO9rd)3*R-N-B
z=Pa}_Of~dF=^BH>k#Q&iY?C_^hYMHi5}ixpLeJ~QLiNt&SxDO$#xhkEZXj;#CaMZ>
zo<0_FOi0U9(nrXy?R%Y$a^kf!@|`1TZ8}fZ?4GyMb)<bP8OfGL(V-Jx>a^oKlB+s3
tY}=Rq$eu^W(222|7`t<0ITVpGbYk31jJtDV+q~c;B?`)tOp`@;=Rf0TGMxYb

diff --git a/cde/programs/dtdocbook/Makefile.am b/cde/programs/dtdocbook/Makefile.am
index ce0feaf6f..ef8956f7b 100644
--- a/cde/programs/dtdocbook/Makefile.am
+++ b/cde/programs/dtdocbook/Makefile.am
@@ -1,7 +1,14 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = instant locales sgml tcl tpt
+SUBDIRS = doc_utils dtsr instant locales sgml spec tcl tpt
 
 include dtdocbook.am
 
 bin_SCRIPTS = dtdocbook2man dtdocbook2sdl
+bin_PROGRAMS = dtdocbook2infolib
+
+AM_LDFLAGS = $(XTOOLLIB) $(DTCLIENTLIBS)
+
+dtdocbook2infolib_CPPFLAGS = \
+			     -DDTDCBK_DATAROOTDIR=\"$(dtdcbk_datarootdir)\" \
+			     -DINFOLIB_LIBEXECDIR=\"$(PWD)\"
diff --git a/cde/programs/dtdocbook/doc_utils/Makefile.am b/cde/programs/dtdocbook/doc_utils/Makefile.am
new file mode 100644
index 000000000..175b69937
--- /dev/null
+++ b/cde/programs/dtdocbook/doc_utils/Makefile.am
@@ -0,0 +1,71 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../dtdocbook.am
+
+infolib = ../infolib
+
+SUBDIRS = $(infolib) ../dtsr
+
+noinst_PROGRAMS = \
+		  dtdocbook2infolib \
+		  MixedGen \
+		  NCFGen \
+		  NodeParser \
+		  StyleUpdate \
+		  dbdrv \
+		  valBase \
+		  validator
+
+noinst_SCRIPTS = dtdocbook2man dtdocbook2sdl
+
+AM_CXXFLAGS = -DCDE_NEXT -I$(top_builddir)/lib/DtMmdb
+AM_LDFLAGS = $(XTOOLLIB) $(LIBMMDB) $(DTCLIENTLIBS)
+
+dtdcbk_datarootdir = $(abs_top_srcdir)/programs/dtdocbook
+
+AM_CPPFLAGS = \
+	      -DDTDCBK_DATAROOTDIR=\"$(dtdcbk_datarootdir)\" \
+	      -DINFOLIB_LIBEXECDIR=\"$(PWD)\"
+
+validator_SOURCES = validator.C
+
+CLEANFILES = $(noinst_SCRIPTS) $(validator_SOURCES) dtdocbook2infolib.c
+
+dtdocbook2infolib.c: ../dtdocbook2infolib.c
+	$(RM) $@ && $(LN_S) $<
+
+validator.C: $(infolib)/validator.C
+	$(RM) $@ && $(LN_S) $<
+
+MixedGen$(EXEEXT): $(infolib)/MixedGen$(EXEEXT)
+	$(RM) $@ && $(LN_S) $<
+
+NCFGen$(EXEEXT): $(infolib)/NCFGen$(EXEEXT)
+	$(RM) $@ && $(LN_S) $<
+
+NodeParser$(EXEEXT): $(infolib)/NodeParser$(EXEEXT)
+	$(RM) $@ && $(LN_S) $<
+
+StyleUpdate$(EXEEXT): $(infolib)/StyleUpdate$(EXEEXT)
+	$(RM) $@ && $(LN_S) $<
+
+dbdrv$(EXEEXT): $(infolib)/dbdrv$(EXEEXT)
+	$(RM) $@ && $(LN_S) $<
+
+valBase$(EXEEXT): $(infolib)/valBase$(EXEEXT)
+	$(RM) $@ && $(LN_S) $<
+
+dtdocbook2man: ../dtdocbook2man
+	echo "#!/bin/sh" > $@ && chmod +x $@
+	echo "dtdcbk_libexecdir=$(dtdcbk_datarootdir) \
+		dtdcbk_datarootdir=$(dtdcbk_datarootdir) \
+		sh $(PWD)/$< \$$@" >> $@
+
+dtdocbook2sdl: ../dtdocbook2sdl
+	echo "#!$(KSH)" > $@ && chmod +x $@
+	echo "dtdcbk_libdir=$(dtdcbk_datarootdir) \
+		dtdcbk_libexecdir=$(dtdcbk_datarootdir) \
+		dtdcbk_datarootdir=$(dtdcbk_datarootdir) \
+		$(KSH) $(PWD)/$< \$$@" >> $@
+
+install:
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c b/cde/programs/dtdocbook/dtdocbook2infolib.c
similarity index 95%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c
rename to cde/programs/dtdocbook/dtdocbook2infolib.c
index 2a88859e0..37cfb1153 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c
+++ b/cde/programs/dtdocbook/dtdocbook2infolib.c
@@ -78,28 +78,16 @@ typedef enum
 typedef struct _GlobalsStruct
 {
     char *pathEnv;
-    char *ldLibraryPathEnv;
-    char *libPathEnv;
-    char *shlibPathEnv;
-    char *dtInfoHomeEnv;
-    char *dtInfoBinEnv;
-    char *tmpDirEnv;
-    char *sgmlSearchPathEnv;
-    char *sgmlCatFilesEnv;
     char *sgmlCatFiles;
     int sgmlCatFilesLen;
     int sgmlCatFilesMaxLen;
-    char *mmdbPathEnv;
 
-    char *install;
-    char *arch;
-    int   dtsridx;      /* dtsearch: index into langtbl */
+    int dtsridx;      /* dtsearch: index into langtbl */
     char *sgml;
     char *decl;
     char *styleProlog;
     char *tmpDir;
     char *spec;
-    int dirMode;
     char *searchEngine;
     char *parser;
 
@@ -156,7 +144,7 @@ static char *emptyString = "";
 
 #define STR(s) ((s) ? (s) : emptyString)
 
-#define EXEC_NAME "dtinfogen"
+#define EXEC_NAME "dtdocbook2infolib"
 
 typedef struct
 {
@@ -950,11 +938,10 @@ buildPath(char *format, ...)
     return XtsNewString(pathBuf);
 }
 
-/* Assumes gStruct->install is set (may be NULL) */
 static char *
 buildSGML(void)
 {
-    char *sgmlPath = buildPath("%s/infolib/sgml", STR(gStruct->install));
+    char *sgmlPath = buildPath("%s/sgml", STR(DTDCBK_DATAROOTDIR));
 
 #ifdef SGML_DEBUG
     fprintf(stderr, "(DEBUG) buildSGML=\"%s\"\n", sgmlPath);
@@ -977,12 +964,10 @@ buildStyleProlog(void)
     return buildPath("%s/styprolog.sgml", STR(gStruct->sgml));
 }
 
-/* Assumes gStruct->install is set (may be NULL) */
 static char *
 buildSpec(void)
 {
-    return buildPath("%s/infolib/etc/mmdb.infolib.spec",
-		     STR(gStruct->install));
+    return buildPath("%s/spec/mmdb.infolib.spec", STR(DTDCBK_DATAROOTDIR));
 }
 
 static void
@@ -997,21 +982,10 @@ defaultGlobals(void)
 	putenv("ENV=");
 
     gStruct->pathEnv = makeAbsPathEnv("PATH");
-    gStruct->ldLibraryPathEnv = makeAbsPathEnv("LD_LIBRARY_PATH");
-    gStruct->libPathEnv = makeAbsPathEnv("LIBPATH");
-    gStruct->shlibPathEnv = makeAbsPathEnv("SHLIB_PATH");
-    gStruct->dtInfoHomeEnv = makeAbsPathEnv("DTINFO_HOME");
-    gStruct->dtInfoBinEnv = makeAbsPathEnv("DTINFO_BIN");
-    gStruct->tmpDirEnv = makeAbsPathEnv("TMPDIR");
-    gStruct->sgmlSearchPathEnv = makeAbsPathEnv("SGML_SEARCH_PATH");
-    gStruct->sgmlCatFilesEnv = makeAbsPathEnv("SGML_CATALOG_FILES");
     gStruct->sgmlCatFiles = NULL;
     gStruct->sgmlCatFilesLen = 0;
     gStruct->sgmlCatFilesMaxLen = 0;
 
-    gStruct->install = getenv("DTINFO_HOME");
-    gStruct->arch = getenv("ARCH");
-
     { /* resolve lang from env variable */
       char* lang;
       char *s = NULL;
@@ -1025,7 +999,7 @@ defaultGlobals(void)
 	  if ((lang = getenv("LANG")) == NULL)
 	    lang = LANG_COMMON;
 
-      lang = strdup(lang);
+      lang = XtsNewString(lang);
 
       s = strchr(lang, '.'); if (s) *s = 0;
 
@@ -1062,11 +1036,10 @@ defaultGlobals(void)
     gStruct->styleProlog = buildStyleProlog();
 
     if ((gStruct->tmpDir = getenv("TMPDIR")) == (char *)NULL)
-	gStruct->tmpDir = "/usr/tmp";
+	gStruct->tmpDir = "/tmp";
 
     gStruct->spec = buildSpec();
 
-    gStruct->dirMode = 0775;
     gStruct->searchEngine = "dtsearch";
     gStruct->parser = "onsgmls";
     gStruct->keepWorkDir = false;
@@ -1078,19 +1051,6 @@ defaultGlobals(void)
 static void
 checkGlobals(void)
 {
-    if ((!gStruct->install) || (!checkStat(gStruct->install, FSTAT_IS_DIR)))
-	die(-1, "%s: Cannot find DtInfo Toolkit installation directory.\n"
-		"\n"
-		"The DTINFO_HOME variable must be set to the directory "
-		"where the DtInfo\n"
-		"toolkit is installed.\n"
-		"\n"
-		"You probably invoked this script in an unsupported manner.\n",
-	    EXEC_NAME);
-
-    if (!gStruct->arch)
-	die(-1, "%s: ARCH not set\n", EXEC_NAME);
-
     if (!checkStat(gStruct->sgml, FSTAT_IS_DIR))
 	die(-1, "%s: Can't find DtInfo SGML directory (%s): %s\n",
 	    EXEC_NAME, STR(gStruct->sgml), strerror(errno));
@@ -1120,20 +1080,18 @@ checkGlobals(void)
 	checkExec("dtsrload");
 	checkExec("dtsrindex");
 
-	gStruct->dtsrlib = buildPath("%s/infolib/etc/%s/dtsr",
-				     gStruct->install,
+	gStruct->dtsrlib = buildPath("%s/dtsr", STR(DTDCBK_DATAROOTDIR),
 				     STR(langtbl[gStruct->dtsridx].name));
 
 	if (!checkStat(gStruct->dtsrlib, FSTAT_IS_DIR)) {
 	    free(gStruct->dtsrlib);
-	    gStruct->dtsrlib = buildPath("%s/infolib/etc/%s/dtsr",
-					gStruct->install, LANG_COMMON);
+	    gStruct->dtsrlib = buildPath("%s/dtsr", STR(DTDCBK_DATAROOTDIR),
+					LANG_COMMON);
 	}
 #ifdef DTSR_DEBUG
 	fprintf(stderr, "(DEBUG) gStruct->dtsrlib=\"%s\"\n", gStruct->dtsrlib);
 #endif
-	gStruct->dbdfile = buildPath("%s/infolib/etc/dtsr/%s.dbd",
-				     gStruct->install,
+	gStruct->dbdfile = buildPath("%s/dtsr/%s.dbd", STR(DTDCBK_DATAROOTDIR),
 				     gStruct->searchEngine);
 	gStruct->keytypes = "Default Head Graphics Example Index Table";
     }
@@ -1311,6 +1269,7 @@ parseDocument(int runCmd, ...)
     va_list ap;
     char *ptr;
     char *cmd = (char *)NULL;
+    char *sed = " | sed 's/\\&\\&/\\&/g' | sed 's/\\&</</g'";
     int cmdLen = 0;
     int maxLen = 0;
 
@@ -1318,11 +1277,7 @@ parseDocument(int runCmd, ...)
 	dieRWD(-1, "%s: faulty installation: %s\n",
 	       EXEC_NAME, strerror(errno));
 
-    addCatFile(buildPath("%s/infolib/sgml/catalog",
-			 STR(gStruct->install)), true);
-
-    if (!gStruct->sgmlSearchPathEnv)
-	gStruct->sgmlSearchPathEnv = addToEnv("SGML_SEARCH_PATH", ".", false);
+    addCatFile(buildPath("%s/catalog", STR(gStruct->sgml)), true);
 
     appendStr(&cmd, &cmdLen, &maxLen, gStruct->parser);
     appendStr(&cmd, &cmdLen, &maxLen, " ");
@@ -1340,6 +1295,8 @@ parseDocument(int runCmd, ...)
 	}
 	va_end(ap);
 
+	appendStr(&cmd, &cmdLen, &maxLen, sed);
+
 	runShellCmd(cmd);
 	free(cmd);
 	return (char *)NULL;
@@ -1356,6 +1313,8 @@ parseDocument(int runCmd, ...)
     }
     va_end(ap);
 
+    appendStr(&cmd, &cmdLen, &maxLen, sed);
+
     return cmd;
 }
 
@@ -1377,9 +1336,6 @@ buildBookcase(char *cmdSrc, char *dirName)
 
     tmpFile = storeBookCase(cmdSrc, "all", dataBase, dirName);
     newMmdbPathEnv = buildPath("MMDB_PATH=%s", STR(gStruct->library));
-    if (gStruct->mmdbPathEnv)
-	free(gStruct->mmdbPathEnv);
-    gStruct->mmdbPathEnv = newMmdbPathEnv;
     putenv(newMmdbPathEnv);
 
     if (gStruct->verbose)
@@ -2326,6 +2282,9 @@ main(int argc, char *argv[])
 {
     GlobalsStruct globalsStruct;
 
+    if (!addToEnv("PATH", STR(INFOLIB_LIBEXECDIR), true))
+	die(-1, "%s: could not set PATH\n", EXEC_NAME);
+
     gStruct = &globalsStruct;
 
     if (argc < 2)
@@ -2333,6 +2292,9 @@ main(int argc, char *argv[])
 
     defaultGlobals();
 
+    if (setenv("LC_CTYPE", STR(langtbl[gStruct->dtsridx].name), 1) == -1)
+	die(-1, "%s: LC_CTYPE: %s\n", EXEC_NAME, strerror(errno));
+
     if (setenv("SP_CHARSET_FIXED", "1", 1) == -1)
 	die(-1, "%s: SP_CHARSET_FIXED: %s\n", EXEC_NAME, strerror(errno));
 
diff --git a/cde/programs/dtdocbook/dtdocbook2man.in b/cde/programs/dtdocbook/dtdocbook2man.in
index 6b1654f1a..a57f2ddc7 100755
--- a/cde/programs/dtdocbook/dtdocbook2man.in
+++ b/cde/programs/dtdocbook/dtdocbook2man.in
@@ -40,7 +40,6 @@ exec_prefix="@exec_prefix@"
 
 dcbk_name="@PACKAGE_TARNAME@/dtdocbook"
 
-dtdcbk_libdir="${dtdcbk_libdir:-@libdir@/${dcbk_name}}"
 dtdcbk_libexecdir="${dtdcbk_libexecdir:-@libexecdir@/${dcbk_name}}"
 dtdcbk_datarootdir="${dtdcbk_datarootdir:-@datarootdir@/${dcbk_name}}"
 
@@ -68,7 +67,7 @@ if [ $# -eq 3 ]
 then	dclfile=$1
 	reffile=$2
 	manfile=$3
-else	echo "usage:  dbtoman [-c] dcl-file ref-src-file man-dst-file"
+else	echo "usage:  dtdocbook2man [-c] dcl-file ref-src-file man-dst-file"
 	exit 1
 fi
 
diff --git a/cde/programs/dtdocbook/dtdocbook2sdl.in b/cde/programs/dtdocbook/dtdocbook2sdl.in
index b06578e77..ece0beee1 100755
--- a/cde/programs/dtdocbook/dtdocbook2sdl.in
+++ b/cde/programs/dtdocbook/dtdocbook2sdl.in
@@ -321,8 +321,12 @@ if [[ -a $basename.$$.esis ]] then
     fi
 fi
 if (( $verbose )); then
-    echo "${sgmls} -deglru$catfiles ${sgml_dir}/docbook.dcl $iname > $basename.$$.esis"
-    ${sgmls} -deglru$catfiles ${sgml_dir}/docbook.dcl $iname > $basename.$$.esis
+    echo "${sgmls} -deglru$catfiles ${sgml_dir}/docbook.dcl $iname | \
+	    sed 's/\&\&/\\|\[amp   \]\\|/g' | sed 's/\&</\\|\[lt    \]\\|/g' \
+	    > $basename.$$.esis"
+    ${sgmls} -deglru$catfiles ${sgml_dir}/docbook.dcl $iname | \
+	    sed 's/\&\&/\\|\[amp   \]\\|/g' | sed 's/\&</\\|\[lt    \]\\|/g' \
+	    > $basename.$$.esis
     if (( $? )); then
 	if (( !$debug )); then
 	    echo "rm -f $basename.$$.esis"
@@ -331,8 +335,9 @@ if (( $verbose )); then
 	fatalError "Error processing $iname by $parser"
     fi
 else
-    ${sgmls} -deglru$catfiles ${sgml_dir}/docbook.dcl $iname \
-				      > $basename.$$.esis 2> $basename.$$.log
+    ${sgmls} -deglru$catfiles ${sgml_dir}/docbook.dcl $iname | \
+	    sed 's/\&\&/\\|\[amp   \]\\|/g' | sed 's/\&</\\|\[lt    \]\\|/g' \
+	    > $basename.$$.esis 2> $basename.$$.log
     if (( $? )); then
 	if (( !$debug )); then
 	    rm -f $basename.$$.esis
diff --git a/cde/programs/dtdocbook/dtsr/Makefile.am b/cde/programs/dtdocbook/dtsr/Makefile.am
new file mode 100644
index 000000000..195353600
--- /dev/null
+++ b/cde/programs/dtdocbook/dtsr/Makefile.am
@@ -0,0 +1,34 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../dtdocbook.am
+
+dtsrdir = $(dtdocbookdatadir)/dtsr
+
+dtsr_DATA = \
+	    dtsearch.dbd \
+	    deu.sfx \
+	    deu.stp \
+	    eng.sfx \
+	    eng.stp \
+	    esp.sfx \
+	    esp.stp \
+	    fra.sfx \
+	    fra.stp \
+	    ita.sfx \
+	    ita.stp \
+	    jpn.knj
+
+noinst_PROGRAMS = mkdbd
+
+dtsearch = ../../../lib/DtSearch
+
+mkdbd_CPPFLAGS = -DBASE_FILE_NAME=\"dtsearch\"
+mkdbd_CFLAGS = $(DT_INCDIR) -I$(dtsearch)/raima
+
+CLEANFILES = dtsearch.dbd mkdbd.c
+
+mkdbd.c: $(dtsearch)/tiny.c
+	$(RM) $@ && $(LN_S) $< $@
+
+dtsearch.dbd: mkdbd
+	./$< > $@
diff --git a/cde/programs/localized/de_DE.UTF-8/dtsr/deu.sfx b/cde/programs/dtdocbook/dtsr/deu.sfx
similarity index 100%
rename from cde/programs/localized/de_DE.UTF-8/dtsr/deu.sfx
rename to cde/programs/dtdocbook/dtsr/deu.sfx
diff --git a/cde/programs/localized/de_DE.UTF-8/dtsr/deu.stp b/cde/programs/dtdocbook/dtsr/deu.stp
similarity index 100%
rename from cde/programs/localized/de_DE.UTF-8/dtsr/deu.stp
rename to cde/programs/dtdocbook/dtsr/deu.stp
diff --git a/cde/programs/localized/C/dtsr/eng.sfx b/cde/programs/dtdocbook/dtsr/eng.sfx
similarity index 100%
rename from cde/programs/localized/C/dtsr/eng.sfx
rename to cde/programs/dtdocbook/dtsr/eng.sfx
diff --git a/cde/programs/localized/C/dtsr/eng.stp b/cde/programs/dtdocbook/dtsr/eng.stp
similarity index 100%
rename from cde/programs/localized/C/dtsr/eng.stp
rename to cde/programs/dtdocbook/dtsr/eng.stp
diff --git a/cde/programs/localized/es_ES.UTF-8/dtsr/esp.sfx b/cde/programs/dtdocbook/dtsr/esp.sfx
similarity index 100%
rename from cde/programs/localized/es_ES.UTF-8/dtsr/esp.sfx
rename to cde/programs/dtdocbook/dtsr/esp.sfx
diff --git a/cde/programs/localized/es_ES.UTF-8/dtsr/esp.stp b/cde/programs/dtdocbook/dtsr/esp.stp
similarity index 100%
rename from cde/programs/localized/es_ES.UTF-8/dtsr/esp.stp
rename to cde/programs/dtdocbook/dtsr/esp.stp
diff --git a/cde/programs/localized/fr_FR.UTF-8/dtsr/fra.sfx b/cde/programs/dtdocbook/dtsr/fra.sfx
similarity index 100%
rename from cde/programs/localized/fr_FR.UTF-8/dtsr/fra.sfx
rename to cde/programs/dtdocbook/dtsr/fra.sfx
diff --git a/cde/programs/localized/fr_FR.UTF-8/dtsr/fra.stp b/cde/programs/dtdocbook/dtsr/fra.stp
similarity index 100%
rename from cde/programs/localized/fr_FR.UTF-8/dtsr/fra.stp
rename to cde/programs/dtdocbook/dtsr/fra.stp
diff --git a/cde/programs/localized/it_IT.UTF-8/dtsr/ita.sfx b/cde/programs/dtdocbook/dtsr/ita.sfx
similarity index 100%
rename from cde/programs/localized/it_IT.UTF-8/dtsr/ita.sfx
rename to cde/programs/dtdocbook/dtsr/ita.sfx
diff --git a/cde/programs/localized/it_IT.UTF-8/dtsr/ita.stp b/cde/programs/dtdocbook/dtsr/ita.stp
similarity index 100%
rename from cde/programs/localized/it_IT.UTF-8/dtsr/ita.stp
rename to cde/programs/dtdocbook/dtsr/ita.stp
diff --git a/cde/programs/dtdocbook/dtsr/jpn.knj b/cde/programs/dtdocbook/dtsr/jpn.knj
new file mode 100644
index 000000000..a4f883b15
--- /dev/null
+++ b/cde/programs/dtdocbook/dtsr/jpn.knj
@@ -0,0 +1,550 @@
+#
+#   COMPONENT_NAME: austext
+#
+#   FUNCTIONS: none
+#
+#   ORIGINS: 27
+#
+#
+#   (C) COPYRIGHT International Business Machines Corp. 1995
+#   All Rights Reserved
+#   Licensed Materials - Property of IBM
+#   US Government Users Restricted Rights - Use, duplication or
+#   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+#
+#**************** JPN.KNJ *******************
+# $XConsortium: jpn.knj /main/2 1996/07/18 15:31:58 drk $
+# September 1995.
+# Most frequent contiguous strings of 2 or more kanji characters
+# from 32456 USENET (fj group) articles).  The comment is the number
+# of times that particular kanji compound occurred in the corpus.
+# Derived from an original list by Tim Buress from a study
+# for TWICS Co. Ltd. and International Education Center, Tokyo.
+#
+# $Log$
+# Revision 2.2  1995/10/25  22:54:21  miker
+# Added prolog.
+#
+# Revision 2.1  1995/09/22  20:57:48  miker
+# Freeze DtSearch 0.1, AusText 2.1.8
+#
+# Revision 1.1  1995/09/19  21:22:47  miker
+# Initial revision
+#
+場合		* 7840
+問題		* 5745
+記事		* 4636
+日本		* 4627
+情報		* 4291
+自分		* 4197
+必要		* 3827
+意味		* 3573
+最近		* 3331
+議論		* 2922
+質問		* 2799
+投稿		* 2642
+以下		* 2624
+名前		* 2584
+時間		* 2576
+本当		* 2567
+現在		* 2486
+関係		* 2418
+方法		* 2208
+最後		* 2164
+出来		* 2138
+最初		* 2102
+話題		* 2058
+結果		* 2039
+日本語		* 2029
+実際		* 2013
+普通		* 1970
+試合		* 1953
+以上		* 1930
+今回		* 1905
+存在		* 1883
+理由		* 1856
+以前		* 1856
+内容		* 1823
+使用		* 1795
+今年		* 1778
+東京		* 1773
+部分		* 1765
+間違		* 1756
+人間		* 1697
+意見		* 1670
+面白		* 1619
+説明		* 1571
+投票		* 1566
+株式会社	* 1555
+非常		* 1549
+期待		* 1546
+以外		* 1515
+簡単		* 1513
+利用		* 1504
+作成		* 1472
+程度		* 1436
+場所		* 1391
+映画		* 1359
+記憶		* 1351
+設定		* 1345
+結構		* 1329
+参加		* 1319
+状態		* 1312
+表示		* 1305
+番組		* 1302
+文字		* 1293
+可能性		* 1265
+結局		* 1261
+漢字		* 1259
+存知		* 1256
+相手		* 1244
+主張		* 1233
+残念		* 1233
+対応		* 1227
+理解		* 1221
+世界		* 1201
+研究所		* 1191
+今日		* 1186
+当然		* 1177
+状況		* 1163
+東大		* 1152
+可能		* 1130
+変更		* 1118
+子供		* 1110
+予定		* 1088
+紹介		* 1085
+興味		* 1085
+確認		* 1078
+同様		* 1065
+女性		* 1051
+英語		* 1050
+機能		* 1032
+指定		* 1031
+出力		* 0996
+原因		* 0991
+判断		* 0981
+一緒		* 0978
+東工大		* 0977
+注意		* 0974
+作品		* 0964
+定義		* 0961
+変換		* 0945
+無理		* 0933
+数学		* 0923
+京大		* 0902
+表現		* 0900
+友人		* 0896
+電話		* 0889
+値段		* 0880
+疑問		* 0863
+実行		* 0862
+言語		* 0859
+参考		* 0843
+音楽		* 0840
+放送		* 0839
+購入		* 0836
+先日		* 0833
+一度		* 0831
+選手		* 0822
+上記		* 0819
+目的		* 0817
+勝手		* 0817
+会社		* 0816
+十分		* 0812
+今度		* 0811
+交換		* 0811
+一部		* 0808
+大丈夫		* 0804
+条件		* 0803
+一人		* 0803
+完全		* 0797
+経験		* 0795
+納得		* 0790
+基本的		* 0790
+評価		* 0785
+大変		* 0781
+研究室		* 0775
+雑誌		* 0773
+個人的		* 0772
+記述		* 0754
+多分		* 0753
+開発		* 0749
+途中		* 0747
+万円		* 0745
+気持		* 0744
+環境		* 0739
+発表		* 0735
+影響		* 0735
+解釈		* 0734
+重要		* 0733
+中村		* 0731
+引用		* 0725
+日本人		* 0717
+事実		* 0717
+通信		* 0716
+発売		* 0715
+鈴木		* 0708
+報告		* 0706
+動作		* 0703
+自由		* 0703
+指摘		* 0695
+来年		* 0692
+一応		* 0692
+関西		* 0687
+一般		* 0680
+選択		* 0679
+阪大		* 0677
+仕事		* 0675
+研究		* 0671
+太田		* 0665
+予想		* 0660
+結論		* 0659
+認識		* 0658
+構成		* 0656
+去年		* 0650
+入力		* 0644
+全部		* 0643
+感想		* 0643
+大阪		* 0642
+無視		* 0640
+写真		* 0638
+東京大学	* 0634
+反対		* 0633
+一番		* 0628
+便利		* 0627
+処理		* 0626
+計算		* 0625
+駄目		* 0624
+危険		* 0622
+今後		* 0621
+頑張		* 0615
+田中		* 0612
+具体的		* 0612
+責任		* 0607
+昨日		* 0607
+入手		* 0605
+賛成		* 0605
+過去		* 0603
+正確		* 0601
+山本		* 0600
+登場		* 0598
+大学		* 0595
+画面		* 0594
+安全		* 0591
+不思議		* 0589
+中略		* 0581
+差別		* 0576
+管理人		* 0576
+接続		* 0573
+仕方		* 0571
+心配		* 0570
+種類		* 0570
+発生		* 0568
+印象		* 0568
+通常		* 0566
+彼女		* 0565
+同時		* 0565
+形式		* 0564
+失礼		* 0559
+一般的		* 0558
+位置		* 0558
+効果		* 0557
+演奏		* 0556
+対象		* 0554
+違法		* 0553
+連絡		* 0548
+池田		* 0548
+両方		* 0547
+当時		* 0546
+適当		* 0546
+行為		* 0546
+趣味		* 0543
+現状		* 0543
+奥山		* 0541
+新聞		* 0540
+比較		* 0539
+時代		* 0536
+有名		* 0535
+情報工学科	* 0532
+運転		* 0530
+技術		* 0522
+年前		* 0519
+個人		* 0516
+会場		* 0513
+決定		* 0512
+森口博子	* 0509
+提供		* 0508
+予約		* 0505
+事故		* 0504
+想像		* 0502
+絶対		* 0502
+文章		* 0501
+知識		* 0500
+自体		* 0500
+横浜		* 0499
+結婚		* 0498
+伊藤		* 0493
+小方		* 0491
+文字列		* 0490
+他人		* 0490
+何度		* 0490
+発言		* 0486
+西田		* 0484
+中心		* 0483
+時期		* 0483
+優勝		* 0481
+展開		* 0481
+関東		* 0480
+失敗		* 0479
+解説		* 0479
+希望		* 0478
+立場		* 0477
+小林		* 0474
+提案		* 0472
+電通大		* 0469
+最高		* 0467
+佐藤		* 0467
+管理		* 0467
+雰囲気		* 0466
+長谷川		* 0466
+電総研		* 0465
+用意		* 0464
+二人		* 0464
+速度		* 0464
+昨年		* 0462
+井上		* 0461
+複数		* 0460
+自然		* 0459
+関連		* 0459
+操作		* 0457
+全体		* 0456
+神野		* 0454
+酒井法子	* 0454
+何故		* 0454
+工学部		* 0452
+日本電気	* 0451
+誤解		* 0451
+免許		* 0450
+区別		* 0450
+初心者		* 0449
+週間		* 0449
+岡田		* 0449
+元気		* 0448
+部屋		* 0447
+有効		* 0444
+範囲		* 0443
+清水		* 0443
+概念		* 0443
+反応		* 0441
+電子		* 0441
+時点		* 0441
+解決		* 0439
+納豆		* 0436
+情報交換	* 0435
+実現		* 0435
+否定		* 0434
+番号		* 0433
+開発部		* 0433
+本人		* 0432
+根拠		* 0431
+変化		* 0430
+現象		* 0430
+関数		* 0429
+河野		* 0429
+皆様		* 0428
+人気		* 0427
+発音		* 0426
+西村知美	* 0425
+製品		* 0424
+苦労		* 0423
+料理		* 0422
+順位		* 0421
+社会		* 0421
+北海道		* 0418
+反論		* 0418
+東芝		* 0418
+意識		* 0418
+前田		* 0417
+面倒		* 0416
+参照		* 0416
+高橋由美子	* 0414
+仕様		* 0413
+旅行		* 0409
+登録		* 0409
+科学		* 0409
+一方		* 0408
+資料		* 0406
+方向		* 0405
+京都		* 0404
+記録		* 0404
+機会		* 0402
+下記		* 0402
+円滑		* 0402
+手元		* 0401
+海外		* 0400
+省略		* 0398
+競馬		* 0397
+三菱電機	* 0396
+今週		* 0396
+攻撃		* 0396
+価値		* 0396
+月号		* 0393
+不幸		* 0392
+先生		* 0392
+自転車		* 0392
+学生		* 0392
+返事		* 0391
+筑波大		* 0390
+教育		* 0390
+電車		* 0389
+実験		* 0387
+起動		* 0387
+法律		* 0386
+直接		* 0386
+方式		* 0385
+発見		* 0385
+修正		* 0385
+研究部		* 0385
+禁止		* 0385
+辞書		* 0384
+案内		* 0384
+勉強		* 0383
+大井		* 0383
+日立		* 0382
+内線		* 0382
+大阪大学	* 0380
+松下電器	* 0380
+文句		* 0378
+不安		* 0377
+距離		* 0377
+価格		* 0376
+迷惑		* 0373
+是非		* 0373
+能力		* 0370
+数字		* 0370
+平成		* 0369
+標準		* 0369
+本来		* 0368
+自信		* 0368
+筑波大学	* 0365
+相当		* 0365
+移動		* 0365
+開催		* 0364
+漫画		* 0363
+富士通		* 0363
+練習		* 0359
+友達		* 0359
+松下		* 0359
+現実		* 0359
+所属		* 0356
+石田		* 0355
+症状		* 0355
+公開		* 0354
+設計		* 0353
+切符		* 0353
+日文酔夢	* 0352
+合意		* 0352
+要求		* 0351
+本体		* 0350
+復活		* 0350
+駐車場		* 0349
+確実		* 0349
+以降		* 0349
+努力		* 0348
+行動		* 0348
+感動		* 0348
+名古屋		* 0347
+斉藤		* 0346
+機械		* 0345
+列車		* 0344
+特別		* 0344
+前提		* 0344
+研究会		* 0344
+明日		* 0343
+藤本		* 0343
+参加者		* 0343
+気分		* 0343
+態度		* 0342
+活動		* 0342
+木村		* 0341
+全然		* 0341
+感覚		* 0339
+修理		* 0338
+山崎		* 0338
+配布		* 0337
+追加		* 0337
+論文		* 0336
+人達		* 0336
+訂正		* 0335
+自身		* 0335
+事業部		* 0335
+不明		* 0334
+一言		* 0334
+事情		* 0333
+基本		* 0333
+特定		* 0332
+制限		* 0332
+高橋		* 0332
+料金		* 0331
+富士通研究所	* 0331
+転送		* 0330
+早見優		* 0330
+終了		* 0330
+後半		* 0329
+中嶋		* 0328
+男性		* 0328
+国内		* 0328
+先週		* 0327
+機種		* 0327
+富士通研	* 0324
+富士		* 0324
+詳細		* 0324
+構造		* 0324
+午後		* 0324
+確保		* 0323
+近藤		* 0321
+録音		* 0319
+大好		* 0319
+新幹線		* 0319
+世話		* 0318
+信号		* 0318
+収録		* 0318
+職業		* 0316
+小川範子	* 0316
+意図		* 0316
+変数		* 0315
+早稲田大学	* 0315
+岡本		* 0315
+違反		* 0315
+歴史		* 0313
+和田		* 0311
+記号		* 0311
+命令		* 0310
+同感		* 0310
+考慮		* 0310
+京都大学	* 0310
+単純		* 0308
+住所		* 0308
+突然		* 0307
+証明		* 0305
+手引		* 0305
+文化		* 0304
+美味		* 0303
+鉄道		* 0303
+阪神		* 0303
+明確		* 0302
+応援		* 0302
+東京工業大学	* 0301
+前川		* 0301
+女子高生	* 0301
+共通		* 0301
+前回		* 0300
+制御		* 0299
+基準		* 0299
+後者		* 0298
+日時		* 0297
+最大		* 0297
+正常		* 0296
+性格		* 0295
+森高千里	* 0295
+#**************** JPN.KNJ *******************
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeData.C b/cde/programs/dtdocbook/infolib/AttributeData.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeData.C
rename to cde/programs/dtdocbook/infolib/AttributeData.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeData.h b/cde/programs/dtdocbook/infolib/AttributeData.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeData.h
rename to cde/programs/dtdocbook/infolib/AttributeData.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeList.C b/cde/programs/dtdocbook/infolib/AttributeList.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeList.C
rename to cde/programs/dtdocbook/infolib/AttributeList.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeList.h b/cde/programs/dtdocbook/infolib/AttributeList.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeList.h
rename to cde/programs/dtdocbook/infolib/AttributeList.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeRec.C b/cde/programs/dtdocbook/infolib/AttributeRec.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeRec.C
rename to cde/programs/dtdocbook/infolib/AttributeRec.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeRec.h b/cde/programs/dtdocbook/infolib/AttributeRec.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeRec.h
rename to cde/programs/dtdocbook/infolib/AttributeRec.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeStore.C b/cde/programs/dtdocbook/infolib/AttributeStore.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeStore.C
rename to cde/programs/dtdocbook/infolib/AttributeStore.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeStore.h b/cde/programs/dtdocbook/infolib/AttributeStore.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/AttributeStore.h
rename to cde/programs/dtdocbook/infolib/AttributeStore.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/AusText.C b/cde/programs/dtdocbook/infolib/AusText.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/AusText.C
rename to cde/programs/dtdocbook/infolib/AusText.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/AusText.h b/cde/programs/dtdocbook/infolib/AusText.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/AusText.h
rename to cde/programs/dtdocbook/infolib/AusText.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/AusTextStorage.C b/cde/programs/dtdocbook/infolib/AusTextStorage.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/AusTextStorage.C
rename to cde/programs/dtdocbook/infolib/AusTextStorage.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/AusTextStorage.h b/cde/programs/dtdocbook/infolib/AusTextStorage.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/AusTextStorage.h
rename to cde/programs/dtdocbook/infolib/AusTextStorage.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/BTCollectable.C b/cde/programs/dtdocbook/infolib/BTCollectable.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/BTCollectable.C
rename to cde/programs/dtdocbook/infolib/BTCollectable.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/BTCollectable.h b/cde/programs/dtdocbook/infolib/BTCollectable.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/BTCollectable.h
rename to cde/programs/dtdocbook/infolib/BTCollectable.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/BaseDataCollect.h b/cde/programs/dtdocbook/infolib/BaseDataCollect.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/BaseDataCollect.h
rename to cde/programs/dtdocbook/infolib/BaseDataCollect.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/BookCaseDB.C b/cde/programs/dtdocbook/infolib/BookCaseDB.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/BookCaseDB.C
rename to cde/programs/dtdocbook/infolib/BookCaseDB.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/BookCaseDB.h b/cde/programs/dtdocbook/infolib/BookCaseDB.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/BookCaseDB.h
rename to cde/programs/dtdocbook/infolib/BookCaseDB.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/BookTasks.C b/cde/programs/dtdocbook/infolib/BookTasks.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/BookTasks.C
rename to cde/programs/dtdocbook/infolib/BookTasks.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/BookTasks.h b/cde/programs/dtdocbook/infolib/BookTasks.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/BookTasks.h
rename to cde/programs/dtdocbook/infolib/BookTasks.h
diff --git a/cde/programs/dtinfo/dtinfogen/install/ChangeCaseTitle b/cde/programs/dtdocbook/infolib/ChangeCaseTitle
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/install/ChangeCaseTitle
rename to cde/programs/dtdocbook/infolib/ChangeCaseTitle
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ConcatTask.C b/cde/programs/dtdocbook/infolib/ConcatTask.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/ConcatTask.C
rename to cde/programs/dtdocbook/infolib/ConcatTask.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ConcatTask.h b/cde/programs/dtdocbook/infolib/ConcatTask.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/ConcatTask.h
rename to cde/programs/dtdocbook/infolib/ConcatTask.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Content.C b/cde/programs/dtdocbook/infolib/Content.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/Content.C
rename to cde/programs/dtdocbook/infolib/Content.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Content.h b/cde/programs/dtdocbook/infolib/Content.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/Content.h
rename to cde/programs/dtdocbook/infolib/Content.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentRec.h b/cde/programs/dtdocbook/infolib/ContentRec.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/ContentRec.h
rename to cde/programs/dtdocbook/infolib/ContentRec.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.h b/cde/programs/dtdocbook/infolib/ContentType.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.h
rename to cde/programs/dtdocbook/infolib/ContentType.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.ll b/cde/programs/dtdocbook/infolib/ContentType.ll
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.ll
rename to cde/programs/dtdocbook/infolib/ContentType.ll
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/DataBase.C b/cde/programs/dtdocbook/infolib/DataBase.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/DataBase.C
rename to cde/programs/dtdocbook/infolib/DataBase.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/DataBase.h b/cde/programs/dtdocbook/infolib/DataBase.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/DataBase.h
rename to cde/programs/dtdocbook/infolib/DataBase.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/DataRepository.C b/cde/programs/dtdocbook/infolib/DataRepository.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/DataRepository.C
rename to cde/programs/dtdocbook/infolib/DataRepository.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/DataRepository.h b/cde/programs/dtdocbook/infolib/DataRepository.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/DataRepository.h
rename to cde/programs/dtdocbook/infolib/DataRepository.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/DataTask.C b/cde/programs/dtdocbook/infolib/DataTask.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/DataTask.C
rename to cde/programs/dtdocbook/infolib/DataTask.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/DataTask.h b/cde/programs/dtdocbook/infolib/DataTask.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/DataTask.h
rename to cde/programs/dtdocbook/infolib/DataTask.h
diff --git a/cde/programs/dtinfo/dtinfogen/install/DeInstallBase b/cde/programs/dtdocbook/infolib/DeInstallBase
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/install/DeInstallBase
rename to cde/programs/dtdocbook/infolib/DeInstallBase
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Dispatch.C b/cde/programs/dtdocbook/infolib/Dispatch.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/Dispatch.C
rename to cde/programs/dtdocbook/infolib/Dispatch.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Dispatch.h b/cde/programs/dtdocbook/infolib/Dispatch.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/Dispatch.h
rename to cde/programs/dtdocbook/infolib/Dispatch.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/EntityList.C b/cde/programs/dtdocbook/infolib/EntityList.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/EntityList.C
rename to cde/programs/dtdocbook/infolib/EntityList.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/EntityList.h b/cde/programs/dtdocbook/infolib/EntityList.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/EntityList.h
rename to cde/programs/dtdocbook/infolib/EntityList.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/EntityScope.h b/cde/programs/dtdocbook/infolib/EntityScope.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/EntityScope.h
rename to cde/programs/dtdocbook/infolib/EntityScope.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ExprList.C b/cde/programs/dtdocbook/infolib/ExprList.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/ExprList.C
rename to cde/programs/dtdocbook/infolib/ExprList.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ExprList.h b/cde/programs/dtdocbook/infolib/ExprList.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/ExprList.h
rename to cde/programs/dtdocbook/infolib/ExprList.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Expression.C b/cde/programs/dtdocbook/infolib/Expression.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/Expression.C
rename to cde/programs/dtdocbook/infolib/Expression.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Expression.h b/cde/programs/dtdocbook/infolib/Expression.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/Expression.h
rename to cde/programs/dtdocbook/infolib/Expression.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/FirstOf.C b/cde/programs/dtdocbook/infolib/FirstOf.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/FirstOf.C
rename to cde/programs/dtdocbook/infolib/FirstOf.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/FirstOf.h b/cde/programs/dtdocbook/infolib/FirstOf.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/FirstOf.h
rename to cde/programs/dtdocbook/infolib/FirstOf.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/FlexBuffer.C b/cde/programs/dtdocbook/infolib/FlexBuffer.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/FlexBuffer.C
rename to cde/programs/dtdocbook/infolib/FlexBuffer.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/FlexBuffer.h b/cde/programs/dtdocbook/infolib/FlexBuffer.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/FlexBuffer.h
rename to cde/programs/dtdocbook/infolib/FlexBuffer.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/GenericId.C b/cde/programs/dtdocbook/infolib/GenericId.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/GenericId.C
rename to cde/programs/dtdocbook/infolib/GenericId.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/GenericId.h b/cde/programs/dtdocbook/infolib/GenericId.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/GenericId.h
rename to cde/programs/dtdocbook/infolib/GenericId.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/GraphicsTask.C b/cde/programs/dtdocbook/infolib/GraphicsTask.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/GraphicsTask.C
rename to cde/programs/dtdocbook/infolib/GraphicsTask.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/GraphicsTask.h b/cde/programs/dtdocbook/infolib/GraphicsTask.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/GraphicsTask.h
rename to cde/programs/dtdocbook/infolib/GraphicsTask.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Handler.C b/cde/programs/dtdocbook/infolib/Handler.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/Handler.C
rename to cde/programs/dtdocbook/infolib/Handler.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Handler.h b/cde/programs/dtdocbook/infolib/Handler.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/Handler.h
rename to cde/programs/dtdocbook/infolib/Handler.h
diff --git a/cde/programs/dtinfo/dtinfogen/install/InstallBase b/cde/programs/dtdocbook/infolib/InstallBase
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/install/InstallBase
rename to cde/programs/dtdocbook/infolib/InstallBase
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/LcfTask.C b/cde/programs/dtdocbook/infolib/LcfTask.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/LcfTask.C
rename to cde/programs/dtdocbook/infolib/LcfTask.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/LcfTask.h b/cde/programs/dtdocbook/infolib/LcfTask.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/LcfTask.h
rename to cde/programs/dtdocbook/infolib/LcfTask.h
diff --git a/cde/programs/dtinfo/dtinfogen/install/Librarian b/cde/programs/dtdocbook/infolib/Librarian
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/install/Librarian
rename to cde/programs/dtdocbook/infolib/Librarian
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Literal.h b/cde/programs/dtdocbook/infolib/Literal.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/Literal.h
rename to cde/programs/dtdocbook/infolib/Literal.h
diff --git a/cde/programs/dtdocbook/infolib/Makefile.am b/cde/programs/dtdocbook/infolib/Makefile.am
new file mode 100644
index 000000000..1aedd831f
--- /dev/null
+++ b/cde/programs/dtdocbook/infolib/Makefile.am
@@ -0,0 +1,154 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../dtdocbook.am
+
+infolibdir = $(dtdocbooklibexecdir)/infolib
+
+infolib_PROGRAMS = \
+		   MixedGen \
+		   NCFGen \
+		   NodeParser \
+		   StyleUpdate \
+		   dbdrv \
+		   valBase \
+		   validator
+
+infolib_SCRIPTS = ChangeCaseTitle DeInstallBase Librarian
+
+noinst_PROGRAMS = restore
+
+AM_LFLAGS = -Cf -L -8 -s
+AM_YFLAGS = -d
+
+AM_CXXFLAGS = \
+	      -DCDE_NEXT \
+	      -DDTDCBK_DATAROOTDIR=\"$(dtdocbookdatadir)\" \
+	      -DDTSEARCH \
+	      -DDtinfoClient \
+	      -DEXPAND_TEMPLATES \
+	      -I$(top_builddir)/lib/DtMmdb
+
+AM_LDFLAGS = $(XTOOLLIB) $(LIBMMDB) $(DTCLIENTLIBS)
+
+MixedGen_SOURCES = \
+		   MixedGen.C \
+		   AttributeList.C \
+		   AttributeRec.C \
+		   BTCollectable.C \
+		   BookCaseDB.C \
+		   DataBase.C \
+		   FlexBuffer.C \
+		   Handler.C \
+		   RemoteId.C \
+		   SGMLName.C \
+		   StringList.C \
+		   Token.C
+
+NCFGen_SOURCES = \
+		 NCFGen.C \
+		 AttributeList.C \
+		 AttributeRec.C \
+		 BTCollectable.C \
+		 BookCaseDB.C \
+		 DataBase.C \
+		 Handler.C \
+		 SGMLName.C \
+		 StringList.C \
+		 StyleValidate.C \
+		 Token.C
+
+NodeParser_SOURCES = \
+		     NodeParser.C \
+		     AttributeData.C \
+		     AttributeList.C \
+		     AttributeRec.C \
+		     AusText.C \
+		     AusTextStorage.C \
+		     BookCaseDB.C \
+		     BookTasks.C \
+		     ConcatTask.C \
+		     Content.C \
+		     ContentType.C \
+		     DataBase.C \
+		     DataRepository.C \
+		     Dispatch.C \
+		     EntityList.C \
+		     ExprList.C \
+		     Expression.C \
+		     FirstOf.C \
+		     FlexBuffer.C \
+		     GenericId.C \
+		     GraphicsTask.C \
+		     Handler.C \
+		     LcfTask.C \
+		     NodeData.C \
+		     NodeTask.C \
+		     OLAF.C \
+		     OL_Data.C \
+		     OL_DataExpr.C \
+		     ReplaceIdIdref.C \
+		     SGMLDefn.C \
+		     SGMLName.C \
+		     SearchEng.C \
+		     SearchPath.C \
+		     StringList.C \
+		     StyleTask.C \
+		     StyleTaskDB.C \
+		     TOCTask.C \
+		     Task.C \
+		     Token.C \
+		     gr_type.C \
+		     lex.ll
+
+StyleUpdate_SOURCES = \
+		      StyleUpdate.C \
+		      AttributeData.C \
+		      AttributeList.C \
+		      AttributeRec.C \
+		      ConcatTask.C \
+		      Content.C \
+		      ContentType.C \
+		      Dispatch.C \
+		      EntityList.C \
+		      ExprList.C \
+		      Expression.C \
+		      FirstOf.C \
+		      FlexBuffer.C \
+		      GenericId.C \
+		      Handler.C \
+		      OLAF.C \
+		      OL_Data.C \
+		      OL_DataExpr.C \
+		      SGMLDefn.C \
+		      SGMLName.C \
+		      SearchPath.C \
+		      StyleTask.C \
+		      StyleValidate.C \
+		      Task.C \
+		      Token.C \
+		      lex.ll
+
+CLEANFILES = \
+	     OL_DataExpr.C \
+	     OL_DataExpr.tab.h \
+	     ContentType.C \
+	     ReplaceIdIdref.C \
+	     RemoteId.C \
+	     gr_type.C \
+	     lex.cc
+
+OL_DataExpr.C: OL_DataExpr.yy
+	$(YACC) $(AM_YFLAGS) -p ol_data -b OL_DataExpr $<
+	mv OL_DataExpr.tab.c $@
+
+ContentType.C: ContentType.ll OL_DataExpr.C
+	$(LEX) $(AM_LFLAGS) -P ol_data -o $@ $<
+
+ReplaceIdIdref.C: ReplaceIdIdref.ll
+	$(LEX) $(AM_LFLAGS) -P nodedata -o $@ $<
+
+RemoteId.C: RemoteId.ll
+	$(LEX) $(AM_LFLAGS) -P remote -o $@ $<
+
+gr_type.C: gr_type.ll
+	$(LEX) $(AM_LFLAGS) -P graphics_task -o $@ $<
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/MixedGen.C b/cde/programs/dtdocbook/infolib/MixedGen.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/MixedGen.C
rename to cde/programs/dtdocbook/infolib/MixedGen.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/NCFGen.C b/cde/programs/dtdocbook/infolib/NCFGen.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/NCFGen.C
rename to cde/programs/dtdocbook/infolib/NCFGen.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeData.C b/cde/programs/dtdocbook/infolib/NodeData.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/NodeData.C
rename to cde/programs/dtdocbook/infolib/NodeData.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeData.h b/cde/programs/dtdocbook/infolib/NodeData.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/NodeData.h
rename to cde/programs/dtdocbook/infolib/NodeData.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeParser.C b/cde/programs/dtdocbook/infolib/NodeParser.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/NodeParser.C
rename to cde/programs/dtdocbook/infolib/NodeParser.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeTask.C b/cde/programs/dtdocbook/infolib/NodeTask.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/NodeTask.C
rename to cde/programs/dtdocbook/infolib/NodeTask.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeTask.h b/cde/programs/dtdocbook/infolib/NodeTask.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/NodeTask.h
rename to cde/programs/dtdocbook/infolib/NodeTask.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/OLAF.C b/cde/programs/dtdocbook/infolib/OLAF.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/OLAF.C
rename to cde/programs/dtdocbook/infolib/OLAF.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/OLAF.h b/cde/programs/dtdocbook/infolib/OLAF.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/OLAF.h
rename to cde/programs/dtdocbook/infolib/OLAF.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_Data.C b/cde/programs/dtdocbook/infolib/OL_Data.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/OL_Data.C
rename to cde/programs/dtdocbook/infolib/OL_Data.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_Data.h b/cde/programs/dtdocbook/infolib/OL_Data.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/OL_Data.h
rename to cde/programs/dtdocbook/infolib/OL_Data.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.yy b/cde/programs/dtdocbook/infolib/OL_DataExpr.yy
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/OL_DataExpr.yy
rename to cde/programs/dtdocbook/infolib/OL_DataExpr.yy
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.ll b/cde/programs/dtdocbook/infolib/RemoteId.ll
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.ll
rename to cde/programs/dtdocbook/infolib/RemoteId.ll
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.ll b/cde/programs/dtdocbook/infolib/ReplaceIdIdref.ll
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.ll
rename to cde/programs/dtdocbook/infolib/ReplaceIdIdref.ll
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SGMLDefn.C b/cde/programs/dtdocbook/infolib/SGMLDefn.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/SGMLDefn.C
rename to cde/programs/dtdocbook/infolib/SGMLDefn.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SGMLDefn.h b/cde/programs/dtdocbook/infolib/SGMLDefn.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/SGMLDefn.h
rename to cde/programs/dtdocbook/infolib/SGMLDefn.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SGMLName.C b/cde/programs/dtdocbook/infolib/SGMLName.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/SGMLName.C
rename to cde/programs/dtdocbook/infolib/SGMLName.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SGMLName.h b/cde/programs/dtdocbook/infolib/SGMLName.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/SGMLName.h
rename to cde/programs/dtdocbook/infolib/SGMLName.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchEng.C b/cde/programs/dtdocbook/infolib/SearchEng.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/SearchEng.C
rename to cde/programs/dtdocbook/infolib/SearchEng.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchEng.h b/cde/programs/dtdocbook/infolib/SearchEng.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/SearchEng.h
rename to cde/programs/dtdocbook/infolib/SearchEng.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C b/cde/programs/dtdocbook/infolib/SearchPath.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C
rename to cde/programs/dtdocbook/infolib/SearchPath.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.h b/cde/programs/dtdocbook/infolib/SearchPath.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.h
rename to cde/programs/dtdocbook/infolib/SearchPath.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchStorage.C b/cde/programs/dtdocbook/infolib/SearchStorage.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/SearchStorage.C
rename to cde/programs/dtdocbook/infolib/SearchStorage.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchStorage.h b/cde/programs/dtdocbook/infolib/SearchStorage.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/SearchStorage.h
rename to cde/programs/dtdocbook/infolib/SearchStorage.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Stack.h b/cde/programs/dtdocbook/infolib/Stack.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/Stack.h
rename to cde/programs/dtdocbook/infolib/Stack.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/StringList.C b/cde/programs/dtdocbook/infolib/StringList.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/StringList.C
rename to cde/programs/dtdocbook/infolib/StringList.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/StringList.h b/cde/programs/dtdocbook/infolib/StringList.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/StringList.h
rename to cde/programs/dtdocbook/infolib/StringList.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/StyleTask.C b/cde/programs/dtdocbook/infolib/StyleTask.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/StyleTask.C
rename to cde/programs/dtdocbook/infolib/StyleTask.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/StyleTask.h b/cde/programs/dtdocbook/infolib/StyleTask.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/StyleTask.h
rename to cde/programs/dtdocbook/infolib/StyleTask.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/StyleTaskDB.C b/cde/programs/dtdocbook/infolib/StyleTaskDB.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/StyleTaskDB.C
rename to cde/programs/dtdocbook/infolib/StyleTaskDB.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/StyleUpdate.C b/cde/programs/dtdocbook/infolib/StyleUpdate.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/StyleUpdate.C
rename to cde/programs/dtdocbook/infolib/StyleUpdate.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/StyleValidate.C b/cde/programs/dtdocbook/infolib/StyleValidate.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/StyleValidate.C
rename to cde/programs/dtdocbook/infolib/StyleValidate.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/StyleValidate.h b/cde/programs/dtdocbook/infolib/StyleValidate.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/StyleValidate.h
rename to cde/programs/dtdocbook/infolib/StyleValidate.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/TKTemplate.C b/cde/programs/dtdocbook/infolib/TKTemplate.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/TKTemplate.C
rename to cde/programs/dtdocbook/infolib/TKTemplate.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/TOCTask.C b/cde/programs/dtdocbook/infolib/TOCTask.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/TOCTask.C
rename to cde/programs/dtdocbook/infolib/TOCTask.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/TOCTask.h b/cde/programs/dtdocbook/infolib/TOCTask.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/TOCTask.h
rename to cde/programs/dtdocbook/infolib/TOCTask.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/TableTask.C b/cde/programs/dtdocbook/infolib/TableTask.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/TableTask.C
rename to cde/programs/dtdocbook/infolib/TableTask.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/TableTask.h b/cde/programs/dtdocbook/infolib/TableTask.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/TableTask.h
rename to cde/programs/dtdocbook/infolib/TableTask.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Task.C b/cde/programs/dtdocbook/infolib/Task.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/Task.C
rename to cde/programs/dtdocbook/infolib/Task.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Task.h b/cde/programs/dtdocbook/infolib/Task.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/Task.h
rename to cde/programs/dtdocbook/infolib/Task.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Token.C b/cde/programs/dtdocbook/infolib/Token.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/Token.C
rename to cde/programs/dtdocbook/infolib/Token.C
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Token.h b/cde/programs/dtdocbook/infolib/Token.h
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/Token.h
rename to cde/programs/dtdocbook/infolib/Token.h
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/dataflow.doc b/cde/programs/dtdocbook/infolib/dataflow.doc
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/dataflow.doc
rename to cde/programs/dtdocbook/infolib/dataflow.doc
diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/src/main.C b/cde/programs/dtdocbook/infolib/dbdrv.C
similarity index 97%
rename from cde/programs/dtinfo/dtinfogen/mmdb/src/main.C
rename to cde/programs/dtdocbook/infolib/dbdrv.C
index a938b65bd..5b67c425b 100644
--- a/cde/programs/dtinfo/dtinfogen/mmdb/src/main.C
+++ b/cde/programs/dtdocbook/infolib/dbdrv.C
@@ -131,12 +131,7 @@ int select_and_process( int argc, char** argv )
 
             ok = load_mixed_objects_from_cin(base_ptr);
          }
-      } else
-
-      if ( (ok = select_debug_routine(argc, argv, mmdb)) == 2 )
-      {
-         usage(argv[1]);
-      }
+      } else usage(argv[1]);
    }
 
    return (ok);
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.ll b/cde/programs/dtdocbook/infolib/gr_type.ll
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.ll
rename to cde/programs/dtdocbook/infolib/gr_type.ll
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/lex.ll b/cde/programs/dtdocbook/infolib/lex.ll
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/lex.ll
rename to cde/programs/dtdocbook/infolib/lex.ll
diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/src/main_c_api.c b/cde/programs/dtdocbook/infolib/main_c_api.c
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/mmdb/src/main_c_api.c
rename to cde/programs/dtdocbook/infolib/main_c_api.c
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/relational-design b/cde/programs/dtdocbook/infolib/relational-design
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/infolib/etc/relational-design
rename to cde/programs/dtdocbook/infolib/relational-design
diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/src/restore.C b/cde/programs/dtdocbook/infolib/restore.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/mmdb/src/restore.C
rename to cde/programs/dtdocbook/infolib/restore.C
diff --git a/cde/programs/dtinfo/dtinfogen/install/valBase.C b/cde/programs/dtdocbook/infolib/valBase.C
similarity index 100%
rename from cde/programs/dtinfo/dtinfogen/install/valBase.C
rename to cde/programs/dtdocbook/infolib/valBase.C
diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/validator.C b/cde/programs/dtdocbook/infolib/validator.C
similarity index 94%
rename from cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/validator.C
rename to cde/programs/dtdocbook/infolib/validator.C
index 6d2f0c53a..e61968c41 100644
--- a/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/validator.C
+++ b/cde/programs/dtdocbook/infolib/validator.C
@@ -111,13 +111,8 @@ int main(int argc, char** argv )
            quit(1);
         }
      } else {
-        char* path = getenv("DTINFO_HOME");
-        if ( path == 0 ) {
-           cerr << "DTINFO_HOME is undefined.\n";
-           quit(1);
-        }
-
-        char* spec_file_path = form("%s/infolib/etc/%s.feature.spec", path, argv[1]);
+        char* spec_file_path = form("%s/spec/%s.feature.spec",
+				    DTDCBK_DATAROOTDIR, argv[1]);
 
         defStream = new fstream(spec_file_path, ios::in);
 
diff --git a/cde/programs/dtdocbook/sgml/Makefile.am b/cde/programs/dtdocbook/sgml/Makefile.am
index 62f0fdce6..71b5fcf5c 100644
--- a/cde/programs/dtdocbook/sgml/Makefile.am
+++ b/cde/programs/dtdocbook/sgml/Makefile.am
@@ -30,4 +30,5 @@ sgml_DATA = docbook.dcl \
 	    isolat2.gml \
 	    isonum.gml \
 	    isopub.gml \
-	    isotech.gml
+	    isotech.gml \
+	    styprolog.sgml
diff --git a/cde/programs/dtdocbook/sgml/examples/docbook.sty b/cde/programs/dtdocbook/sgml/examples/docbook.sty
index 5f406287c..2c5827c4e 100644
--- a/cde/programs/dtdocbook/sgml/examples/docbook.sty
+++ b/cde/programs/dtdocbook/sgml/examples/docbook.sty
@@ -1140,7 +1140,7 @@
 		<suffix><content> ...</content></suffix>
 	</print>
 
-<PATH> GROUP <select> @Choice == "OPT" && @Rep == "REPEAT" </select></PATH>
+<PATH> GROUP <select> @Choice == "OPT" &amp;&amp; @Rep == "REPEAT" </select></PATH>
 	<online>
 		<prefix><content> [</content></prefix>
 		<suffix><content> ...]</content></suffix>
@@ -1178,7 +1178,7 @@
 		<suffix><content> ...</content></suffix>
 	</print>
 
-<PATH> ARG <select> @Choice == "OPT" && @Rep == "REPEAT" </select></PATH>
+<PATH> ARG <select> @Choice == "OPT" &amp;&amp; @Rep == "REPEAT" </select></PATH>
 	<online>
 		<prefix><content> [</content></prefix>
 		<suffix><content> ...]</content></suffix>
@@ -1211,7 +1211,7 @@
 		<prefix><content> | </content></prefix>
 	</print>
 
-<PATH> GROUP ARG <select> position != 1 && @Choice == "OPT" </select></PATH>
+<PATH> GROUP ARG <select> position != 1 &amp;&amp; @Choice == "OPT" </select></PATH>
 	<online>
 		<prefix><content> | [</content></prefix>
 		<suffix><content>]</content></suffix>
@@ -1221,7 +1221,7 @@
 		<suffix><content>]</content></suffix>
 	</print>
 
-<PATH> GROUP ARG <select> position != 1 && @Rep == "REPEAT" </select></PATH>
+<PATH> GROUP ARG <select> position != 1 &amp;&amp; @Rep == "REPEAT" </select></PATH>
 	<online>
 		<prefix><content> | </content></prefix>
 		<suffix><content> ...</content></suffix>
@@ -1231,7 +1231,7 @@
 		<suffix><content> ...</content></suffix>
 	</print>
 
-<PATH> GROUP ARG <select> position != 1 && @Choice == "OPT" && @Rep == "REPEAT" </select></PATH>
+<PATH> GROUP ARG <select> position != 1 &amp;&amp; @Choice == "OPT" &amp;&amp; @Rep == "REPEAT" </select></PATH>
 	<online>
 		<prefix><content> | [</content></prefix>
 		<suffix><content> ...]</content></suffix>
diff --git a/cde/programs/dtdocbook/sgml/styprolog.sgml b/cde/programs/dtdocbook/sgml/styprolog.sgml
new file mode 100644
index 000000000..3243afbbe
--- /dev/null
+++ b/cde/programs/dtdocbook/sgml/styprolog.sgml
@@ -0,0 +1,23 @@
+<!DOCTYPE StyleSheet PUBLIC 
+"-//Common Desktop Environment//DTD DtInfo Bookcase Description//EN" [
+
+<!ENTITY % ISO-List PUBLIC 
+"-//Common Desktop Environment//ENTITIES ISO Catalog//EN">
+	%ISO-List;
+
+	%ISOamsa;
+	%ISOamsb;
+	%ISOamsn;
+	%ISOamso;
+	%ISOamsr;
+	%ISOcyr1;
+	%ISOdia;
+	%ISOgrk1;
+	%ISOgrk3;
+	%ISOlat1;
+	%ISOlat2;
+	%ISOnum;
+	%ISOpub;
+	%ISOtech;
+]>
+
diff --git a/cde/programs/dtdocbook/spec/Makefile.am b/cde/programs/dtdocbook/spec/Makefile.am
new file mode 100644
index 000000000..964773e5f
--- /dev/null
+++ b/cde/programs/dtdocbook/spec/Makefile.am
@@ -0,0 +1,7 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../dtdocbook.am
+
+specdir = $(dtdocbookdatadir)/spec
+
+spec_DATA = hardcopy.feature.spec mmdb.infolib.spec online.feature.spec
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/hardcopy.feature.spec b/cde/programs/dtdocbook/spec/hardcopy.feature.spec
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/hardcopy.feature.spec
rename to cde/programs/dtdocbook/spec/hardcopy.feature.spec
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/mmdb.infolib.spec b/cde/programs/dtdocbook/spec/mmdb.infolib.spec
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/mmdb.infolib.spec
rename to cde/programs/dtdocbook/spec/mmdb.infolib.spec
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/online.feature.spec b/cde/programs/dtdocbook/spec/online.feature.spec
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/online.feature.spec
rename to cde/programs/dtdocbook/spec/online.feature.spec
diff --git a/cde/programs/dtdocbook/tcl/docbook.tcl b/cde/programs/dtdocbook/tcl/docbook.tcl
index 7357d088e..dcbd6b86b 100755
--- a/cde/programs/dtdocbook/tcl/docbook.tcl
+++ b/cde/programs/dtdocbook/tcl/docbook.tcl
@@ -996,15 +996,10 @@ proc ValidMark {mark} {
 	set mark [string range $mark 2 9]
     }
 
-    if {![string match {\[??????\]} $mark]} {
-	UserError "Unknown list mark \"$mark\" specified, using PLAIN" yes
-	return PLAIN
-    } else {
-	foreach m [array names validMarkArray] {
-	    if {$validMarkArray($m) == $mark} {return $m}
-	}
-	return [AddToMarkArray $mark]
+    foreach m [array names validMarkArray] {
+	if {$validMarkArray($m) == $mark} {return $m}
     }
+    return [AddToMarkArray $mark]
 }
 
 
@@ -1369,8 +1364,14 @@ proc ListItem {id override} {
 	    Emit "<BLOCK [Id $labelId] CLASS=\"ITEM\""
 	    Emit " TIMING=\"ASYNC\" "
 	    Emit "SSI=\"$firstString$spacing-MARKED\""
-	    Emit ">\n<P SSI=\"P1\"><SPC NAME=\"$validMarkArray($mark)\""
-	    Emit "></P>\n</BLOCK>\n"
+
+	    if {[string match {\[??????\]} $mark]} {
+		Emit ">\n<P SSI=\"P1\"><SPC NAME=\"$validMarkArray($mark)\""
+		Emit "></P>\n</BLOCK>\n"
+	    } else {
+		Emit ">\n<P SSI=\"P1\">$validMarkArray($mark)"
+		Emit "</P>\n</BLOCK>\n"
+	    }
 	}
     }
 
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am b/cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am
index c658a775b..372ad1aa2 100644
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am
@@ -1,8 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-specdir = $(pkgdatadir)/DtMmdb
-spec_DATA = hardcopy.feature.spec online.feature.spec
-
 noinst_LTLIBRARIES = libStyleSheet.la
 
 libStyleSheet_la_CXXFLAGS = -DEXPAND_TEMPLATES -DCDE_NEXT -I..
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am b/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am
index bbb830a94..fce7b357c 100644
--- a/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am
@@ -1,8 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-specdir = $(pkgdatadir)/DtMmdb
-spec_DATA = mmdb.infolib.spec
-
 noinst_LTLIBRARIES = liboliasdb.la
 
 liboliasdb_la_CXXFLAGS = -DNO_DB_LOCK -I..
diff --git a/cde/programs/dtinfo/dtinfogen/Imakefile b/cde/programs/dtinfo/dtinfogen/Imakefile
deleted file mode 100644
index 9234f3e93..000000000
--- a/cde/programs/dtinfo/dtinfogen/Imakefile
+++ /dev/null
@@ -1,22 +0,0 @@
-XCOMM $TOG: Imakefile /main/12 1998/08/10 15:54:48 mgreess $
-
-#define IHaveSubdirs
-#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' 'CXXDEBUGFLAGS=$(CXXDEBUGFLAGS)'
-
-SUBDIRS=mmdb infolib install
-
-XCOMM redefine TopLevelProject to build DtInfo with standard CDE config dir
-#undef  TopLevelProject
-#define TopLevelProject		DtInfo
-IMAKE_DEF_DTINFO =  -DTopLevelProject=TopLevelProject \
-		    -DProjectTmplFile='<DtInfo.tmpl>' \
-		    -DProjectRulesFile='<DtInfo.rules>'
-
-XCOMM Variables to switch on debug mode temporarily
-XCOMM CDEBUGFLAGS = -g -DDEBUG
-XCOMM CXXDEBUGFLAGS = -g -DDEBUG
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-NamedTargetSubdirs(install_buildtools,$(SUBDIRS),\
-                   install_buildtools,,install_buildtools)
diff --git a/cde/programs/dtinfo/dtinfogen/Makefile.am b/cde/programs/dtinfo/dtinfogen/Makefile.am
deleted file mode 100644
index 7bac1b261..000000000
--- a/cde/programs/dtinfo/dtinfogen/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = mmdb infolib install
diff --git a/cde/programs/dtinfo/dtinfogen/global/olGlobal.h b/cde/programs/dtinfo/dtinfogen/global/olGlobal.h
deleted file mode 100644
index f63dbb238..000000000
--- a/cde/programs/dtinfo/dtinfogen/global/olGlobal.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * CDE - Common Desktop Environment
- *
- * Copyright (c) 1993-2012, The Open Group. All rights reserved.
- *
- * These libraries and programs are free software; you can
- * redistribute them and/or modify them under the terms of the GNU
- * Lesser General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * These libraries and programs are distributed in the hope that
- * they will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with these libraries and programs; if not, write
- * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- * Floor, Boston, MA 02110-1301 USA
- */
-/*
- * $XConsortium: olGlobal.h /main/2 1996/06/06 19:35:14 lehors $
- *
- * Copyright (c) 1993 HAL Computer Systems International, Ltd.
- * All rights reserved.  Unpublished -- rights reserved under
- * the Copyright Laws of the United States.  USE OF A COPYRIGHT
- * NOTICE IS PRECAUTIONARY ONLY AND DOES NOT IMPLY PUBLICATION
- * OR DISCLOSURE.
- * 
- * THIS SOFTWARE CONTAINS CONFIDENTIAL INFORMATION AND TRADE
- * SECRETS OF HAL COMPUTER SYSTEMS INTERNATIONAL, LTD.  USE,
- * DISCLOSURE, OR REPRODUCTION IS PROHIBITED WITHOUT THE
- * PRIOR EXPRESS WRITTEN PERMISSION OF HAL COMPUTER SYSTEMS
- * INTERNATIONAL, LTD.
- * 
- *                         RESTRICTED RIGHTS LEGEND
- * Use, duplication, or disclosure by the Government is subject
- * to the restrictions as set forth in subparagraph (c)(l)(ii)
- * of the Rights in Technical Data and Computer Software clause
- * at DFARS 252.227-7013.
- *
- *          HAL COMPUTER SYSTEMS INTERNATIONAL, LTD.
- *                  1315 Dell Avenue
- *                  Campbell, CA  95008
- * 
- */
-
-/* All the common stuff across different unix platform will be put here */
-
-#ifndef OL_GLOBAL
-
-#define OL_GLOBAL
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-
-#endif
-
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/Makefile.am b/cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/Makefile.am
deleted file mode 100644
index 8d662750b..000000000
--- a/cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = SGML
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/Makefile.am b/cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/Makefile.am
deleted file mode 100644
index 445738efd..000000000
--- a/cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-DECL_FILES= \
-        dtinfo.decl
-
-DTD_FILES= \
-        dtinfoBook.dtd \
-        dtinfoStyle.dtd \
-        dtinfoTOC.dtd \
-        docbook.dtd
-
-ENTITY_FILES= \
-        dtinfo.af \
-        catalog \
-        hal.gml \
-        iso-catalog  \
-        iso-amsa.gml \
-        iso-amsb.gml \
-        iso-amsc.gml \
-        iso-amsn.gml \
-        iso-amso.gml \
-        iso-amsr.gml \
-        iso-box.gml  \
-        iso-cyr1.gml \
-        iso-cyr2.gml \
-        iso-dia.gml  \
-        iso-grk1.gml \
-        iso-grk2.gml \
-        iso-grk3.gml \
-        iso-grk4.gml \
-        iso-lat1.gml \
-        iso-lat2.gml \
-        iso-mfrk.gml \
-        iso-mopf.gml \
-        iso-mscr.gml \
-        iso-num.gml  \
-        iso-pub.gml  \
-        iso-tech.gml
-
-MISC_FILES= \
-        styprolog.sgml
-
-ALL_FILES = $(DECL_FILES) $(DTD_FILES) $(ENTITY_FILES) $(MISC_FILES)
-
-sgmldir = $(CDE_INSTALLATION_TOP)/infolib/C/SGML
-sgml_DATA = $(ALL_FILES)
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/Makefile.am b/cde/programs/dtinfo/dtinfogen/infolib/Makefile.am
deleted file mode 100644
index b0201fa06..000000000
--- a/cde/programs/dtinfo/dtinfogen/infolib/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = etc C.ISO-8859-1
-
-# Not supported, but we'll keep it here in case someday...
-# SUBDIRS += ja_JP.EUC-JP
-
-BUILT_SOURCES = C
-CLEANFILES = $(BUILT_SOURCES)
-
-C:
-	$(LN_S) C.ISO-8859-1 $@
-
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile b/cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile
deleted file mode 100644
index 799449ad4..000000000
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile
+++ /dev/null
@@ -1,385 +0,0 @@
-XCOMM $TOG: Imakefile /main/27 1997/09/05 11:29:30 samborn $
-
-DEPEND_DEFINES = $(DEPENDDEFINES)
-CXXEXTRA_INCLUDES = -DEXPAND_TEMPLATES
-
-NormalCplusplusObjectRule()
-
-#ifdef RegenParserFiles
-XCOMM lex flags
-LFLAGS=-Cf -L -8 -s 
-YFLAGS=-d
-#endif
-#ifdef DoLicenseManagement
-LIC_FLAGS=-DLICENSE_MANAGEMENT
-LIC_INCLUDES=$(LICENSE_L_INCLUDES) $(LICENSE_F_INCLUDES)
-LIC_LIBS=$(LICENSE_L_LIBS)
-#endif
-
-#ifdef UseRWClasses
-XCOMM make rogue into a defined item in site.def
-INCLUDES=-I/VOB/olias/control/rogue 
-ROGUE_LIBS=$(RW_LIBDIR) $(RW_LIB)
-#endif
-
-INCLUDES=$(CXXDEPENDINCLUDES) $(MMDB_INCLUDES) $(EXCEPTIONS_INCLUDES) \
-         $(MISC_INCLUDES) $(GLOBAL_INCLUDES) $(DBUG_INCLUDES) \
-	 $(COMMON_CLASS_INCLUDES) $(LIC_INCLUDES)
-
-
- 
-MMDB_DIR=../../../mmdb
-
-#ifdef AIXArchitecture
-
-API_OBJS = \
-	$(MMDB_DIR)/api/base.o			$(MMDB_DIR)/api/info_base.o \
-	$(MMDB_DIR)/api/info_lib.o			$(MMDB_DIR)/api/smart_ptr.o \
-	$(MMDB_DIR)/api/transaction.o		$(MMDB_DIR)/api/utility.o
-
-BTREE_OBJS = \
-	$(MMDB_DIR)/btree/mmdb_btree.o
-
-#if !defined(AIXArchitecture)
-EXTRA_BTREE_BERKELEY_OBJS = $(MMDB_DIR)/btree_berkeley/memmove.o
-#endif
-
-BTREE_BERKELEY_OBJS = \
-	$(MMDB_DIR)/btree_berkeley/bt_close.o	$(MMDB_DIR)/btree_berkeley/bt_conv.o \
-	$(MMDB_DIR)/btree_berkeley/bt_debug.o	$(MMDB_DIR)/btree_berkeley/bt_delete.o \
-	$(MMDB_DIR)/btree_berkeley/bt_get.o		$(MMDB_DIR)/btree_berkeley/bt_open.o \
-	$(MMDB_DIR)/btree_berkeley/bt_overflow.o	$(MMDB_DIR)/btree_berkeley/bt_page.o \
-	$(MMDB_DIR)/btree_berkeley/bt_put.o		$(MMDB_DIR)/btree_berkeley/bt_search.o \
-	$(MMDB_DIR)/btree_berkeley/bt_seq.o		$(MMDB_DIR)/btree_berkeley/bt_split.o \
-	$(MMDB_DIR)/btree_berkeley/bt_stack.o	$(MMDB_DIR)/btree_berkeley/bt_utils.o \
-	$(MMDB_DIR)/btree_berkeley/mktemp.o		$(MMDB_DIR)/btree_berkeley/realloc.o \
-	$(MMDB_DIR)/btree_berkeley/snprintf.o	$(EXTRA_BTREE_BERKELEY_OBJS) \
-	$(MMDB_DIR)/btree_berkeley/mpool.o		$(MMDB_DIR)/btree_berkeley/db.o
-
-COMPRESSION_OBJS = \
-	$(MMDB_DIR)/compression/abs_agent.o		$(MMDB_DIR)/compression/zip.o \
-	$(MMDB_DIR)/compression/huffman.o		$(MMDB_DIR)/compression/trie.o \
-	$(MMDB_DIR)/compression/code.o		$(MMDB_DIR)/compression/lzss.o \
-	$(MMDB_DIR)/compression/sgml.o		$(MMDB_DIR)/compression/ps.o
-
-DISKHASH_OBJS = \
-	$(MMDB_DIR)/diskhash/disk_bucket.o		$(MMDB_DIR)/diskhash/bucket_array.o \
-	$(MMDB_DIR)/diskhash/disk_hash.o
-
-DSTR_OBJS = \
-	$(MMDB_DIR)/dstr/set.o			$(MMDB_DIR)/dstr/bset.o \
-	$(MMDB_DIR)/dstr/slist.o			$(MMDB_DIR)/dstr/dlist_cell.o \
-	$(MMDB_DIR)/dstr/dlist.o			$(MMDB_DIR)/dstr/heap.o \
-	$(MMDB_DIR)/dstr/void_ptr_array.o		$(MMDB_DIR)/dstr/void_ptr_stack.o \
-	$(MMDB_DIR)/dstr/memory_pool.o		$(MMDB_DIR)/dstr/dstr_test.o \
-	$(MMDB_DIR)/dstr/index_agent.o		$(MMDB_DIR)/dstr/token_stack.o \
-	$(MMDB_DIR)/dstr/slist_char_ptr_cell.o
-
-DTI_EXCS_OBJS = \
-	$(MMDB_DIR)/dti_excs/Jump_Environment.o	$(MMDB_DIR)/dti_excs/Exceptions.o \
-	$(MMDB_DIR)/dti_excs/Exception.o		$(MMDB_DIR)/dti_excs/Destructable.o \
-	$(MMDB_DIR)/dti_excs/terminate.o
-
-DYNHASH_OBJS = \
-	$(MMDB_DIR)/dynhash/data_t.o		$(MMDB_DIR)/dynhash/imp_bucket.o \
-	$(MMDB_DIR)/dynhash/imp_die.o
-
-HMPHF_OBJS = \
-	$(MMDB_DIR)/hmphf/buckets.o			$(MMDB_DIR)/hmphf/mphf_funcs.o \
-	$(MMDB_DIR)/hmphf/mphf_hash_table.o		$(MMDB_DIR)/hmphf/params.o \
-	$(MMDB_DIR)/hmphf/pattern.o			$(MMDB_DIR)/hmphf/sorter.o
-
-INDEX_OBJS = \
-	$(MMDB_DIR)/index/btree_index.o		$(MMDB_DIR)/index/dyn_disk_index.o \
-	$(MMDB_DIR)/index/dyn_index.o		$(MMDB_DIR)/index/dyn_memory_index.o \
-	$(MMDB_DIR)/index/fast_mphf.o		$(MMDB_DIR)/index/hash.o \
-	$(MMDB_DIR)/index/index.o			$(MMDB_DIR)/index/inv_lists.o \
-	$(MMDB_DIR)/index/mphf_index.o
-
-MGRS_OBJS = \
-	$(MMDB_DIR)/mgrs/managers.o			$(MMDB_DIR)/mgrs/misc.o \
-	$(MMDB_DIR)/mgrs/query_mgr.o		$(MMDB_DIR)/mgrs/template_mgr.o
-
-MISC_OBJS = \
-	$(MMDB_DIR)/misc/unique_id.o
-
-OBJECT_OBJS = \
-	$(MMDB_DIR)/object/composite.o		$(MMDB_DIR)/object/compressed_pstring.o \
-	$(MMDB_DIR)/object/cset.o			$(MMDB_DIR)/object/dl_list.o \
-	$(MMDB_DIR)/object/dl_list_cell.o		$(MMDB_DIR)/object/handler.o \
-	$(MMDB_DIR)/object/integer.o		$(MMDB_DIR)/object/long_pstring.o \
-	$(MMDB_DIR)/object/oid.o			$(MMDB_DIR)/object/oid_list.o \
-	$(MMDB_DIR)/object/oid_t.o			$(MMDB_DIR)/object/primitive.o \
-	$(MMDB_DIR)/object/pstring.o		$(MMDB_DIR)/object/random_gen.o \
-	$(MMDB_DIR)/object/root.o			$(MMDB_DIR)/object/short_list.o \
-	$(MMDB_DIR)/object/tuple.o
-
-OLIASDB_OBJS = \
-	$(MMDB_DIR)/oliasdb/asciiIn_filters.o 	$(MMDB_DIR)/oliasdb/collectionIterator.o \
-	$(MMDB_DIR)/oliasdb/dlp_hd.o 		$(MMDB_DIR)/oliasdb/dlp_test.o \
-	$(MMDB_DIR)/oliasdb/doc_hd.o 		$(MMDB_DIR)/oliasdb/doc_test.o \
-	$(MMDB_DIR)/oliasdb/graphic_hd.o 		$(MMDB_DIR)/oliasdb/graphic_test.o \
-	$(MMDB_DIR)/oliasdb/loc_test.o 		$(MMDB_DIR)/oliasdb/locator_hd.o \
-	$(MMDB_DIR)/oliasdb/mark.o 			$(MMDB_DIR)/oliasdb/mark_base.o  \
-	$(MMDB_DIR)/oliasdb/mark_test.o 		$(MMDB_DIR)/oliasdb/mmdb.o \
-	$(MMDB_DIR)/oliasdb/node_hd.o 		$(MMDB_DIR)/oliasdb/node_test.o \
-	$(MMDB_DIR)/oliasdb/olias_funcs.o 		$(MMDB_DIR)/oliasdb/olias_test.o \
-	$(MMDB_DIR)/oliasdb/stylesheet_hd.o 	$(MMDB_DIR)/oliasdb/stylesheet_test.o \
-	$(MMDB_DIR)/oliasdb/toc_hd.o 		$(MMDB_DIR)/oliasdb/toc_test.o \
-	$(MMDB_DIR)/oliasdb/user_base.o
-
-SCHEMA_OBJS = \
-	$(MMDB_DIR)/schema/desc.o			$(MMDB_DIR)/schema/store_desc.o \
-	$(MMDB_DIR)/schema/object_dict.o		$(MMDB_DIR)/schema/stored_object_desc.o \
-	$(MMDB_DIR)/schema/index_desc.o		$(MMDB_DIR)/schema/inv_desc.o \
-	$(MMDB_DIR)/schema/agent_desc.o		$(MMDB_DIR)/schema/container_desc.o \
-	$(MMDB_DIR)/schema/sheet.o			$(MMDB_DIR)/schema/token.o
-
-STORAGE_OBJS = \
-	$(MMDB_DIR)/storage/abs_storage.o		$(MMDB_DIR)/storage/chunks_index.o	\
-	$(MMDB_DIR)/storage/heap_comp_funcs.o	$(MMDB_DIR)/storage/lru.o \
-	$(MMDB_DIR)/storage/page.o			$(MMDB_DIR)/storage/page_cache.o \
-	$(MMDB_DIR)/storage/page_rep.o		$(MMDB_DIR)/storage/page_storage.o \
-	$(MMDB_DIR)/storage/rep_cell.o		$(MMDB_DIR)/storage/rep_policy.o \
-	$(MMDB_DIR)/storage/store_test.o		$(MMDB_DIR)/storage/unixf_storage.o \
-	$(MMDB_DIR)/storage/version.o		$(MMDB_DIR)/storage/vm_storage.o
-
-UTILITY_OBJS = \
-	$(MMDB_DIR)/utility/funcs.o			$(MMDB_DIR)/utility/ostring.o \
-	$(MMDB_DIR)/utility/pm_random.o		$(MMDB_DIR)/utility/atoi_pearson.o \
-	$(MMDB_DIR)/utility/xtime.o			$(MMDB_DIR)/utility/buffer.o \
-	$(MMDB_DIR)/utility/atoi_larson.o		$(MMDB_DIR)/utility/atomic_lock.o \
-	$(MMDB_DIR)/utility/rw_lock.o		$(MMDB_DIR)/utility/atoi_fast.o \
-	$(MMDB_DIR)/utility/filter.o		$(MMDB_DIR)/utility/mmdb_exception.o \
-	$(MMDB_DIR)/utility/randomize.o
-
-DTI_CC_OBJS = \
-	$(MMDB_DIR)/dti_cc/CC_Listbase.o		$(MMDB_DIR)/dti_cc/cc_exceptions.o \
-	$(MMDB_DIR)/dti_cc/CC_String.o		$(MMDB_DIR)/dti_cc/CC_Tokenizer.o \
-	$(MMDB_DIR)/dti_cc/CC_Stack.o		$(MMDB_DIR)/dti_cc/CC_Slist.o
-
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
-EXTRA_HARDCOPY_OBJS = $(MMDB_DIR)/HardCopy/TemplatesAutoNumber.o
-#endif
-
-HARDCOPY_OBJS = \
-	$(MMDB_DIR)/HardCopy/FPset.o		$(MMDB_DIR)/HardCopy/HardCopyFP.o \
-	$(MMDB_DIR)/HardCopy/autoNumber.o		$(MMDB_DIR)/HardCopy/autoNumberFP.o \
-	$(EXTRA_HARDCOPY_OBJS)
-
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
-EXTRA_STYLESHEET_OBJS = $(MMDB_DIR)/StyleSheet/SSTemplates.o
-#endif
-
-STYLESHEET_OBJS = \
-	$(MMDB_DIR)/StyleSheet/Attribute.o		$(MMDB_DIR)/StyleSheet/AttributeList.o \
-	$(MMDB_DIR)/StyleSheet/BitVector.o		$(MMDB_DIR)/StyleSheet/DocParser.o \
-	$(MMDB_DIR)/StyleSheet/Element.o		$(MMDB_DIR)/StyleSheet/Expression.o \
-	$(MMDB_DIR)/StyleSheet/Feature.o		$(MMDB_DIR)/StyleSheet/FeatureDefDictionary.o \
-	$(MMDB_DIR)/StyleSheet/FeatureSet.o		$(MMDB_DIR)/StyleSheet/FeatureValue.o \
-	$(MMDB_DIR)/StyleSheet/PathQualifier.o		$(MMDB_DIR)/StyleSheet/PathTable.o \
-	$(MMDB_DIR)/StyleSheet/Resolver.o		$(MMDB_DIR)/StyleSheet/ResolverStack.o \
-	$(MMDB_DIR)/StyleSheet/SSPath.o			$(MMDB_DIR)/StyleSheet/StyleSheet.o \
-	$(MMDB_DIR)/StyleSheet/StyleSheetExceptions.o \
-	$(MMDB_DIR)/StyleSheet/SymTab.o			$(MMDB_DIR)/StyleSheet/VariableTable.o \
-	$(MMDB_DIR)/StyleSheet/defParser.o		$(MMDB_DIR)/StyleSheet/defToken.o \
-	$(MMDB_DIR)/StyleSheet/style.o			$(MMDB_DIR)/StyleSheet/tokenStyle.o \
-	$(MMDB_DIR)/StyleSheet/RendererHCV.o	$(EXTRA_STYLESHEET_OBJS)
-
-MMDB_OBJS = $(HARDCOPY_OBJS) $(STYLESHEET_OBJS) $(DTI_CC_OBJS)
-
-ALL_MMDB_OBJS =	$(API_OBJS)		$(BTREE_OBJS) \
-	$(BTREE_BERKELEY_OBJS)	$(COMPRESSION_OBJS) \
-	$(DISKHASH_OBJS)	$(DSTR_OBJS) \
-	$(DTI_EXCS_OBJS) 	$(DYNHASH_OBJS) \
-	$(HMPHF_OBJS)		$(INDEX_OBJS) \
-	$(MGRS_OBJS)		$(MISC_OBJS) \
-	$(OBJECT_OBJS)		$(OLIASDB_OBJS) \
-	$(SCHEMA_OBJS)		$(STORAGE_OBJS) \
-	$(UTILITY_OBJS)		$(MMDB_OBJS)
-#endif
-
-#ifdef AIXArchitecture
-Libs =  $(LINKLIBS) $(ALL_MMDB_OBJS) $(LIC_LIBS) $(DBUG_LIBS) $(DTSVCLIB) $(TTLIB) $(MATH_LIB)
-#else
-Libs =  $(LINKLIBS) $(MMDB_LIBS) $(LIC_LIBS) $(DBUG_LIBS) $(MATH_LIB)
-#endif
-
-#ifdef UseQSearch
-SEARCHENG=QSearch
-#else
-#ifdef UseDtSearch
-SEARCHENG=AusText
-#endif
-#endif
-
-#ifdef UseDtSearch
-SEARCH_SRCS=$(SEARCHENG).C $(SEARCHENG)Storage.C
-SEARCH_OBJS=$(SEARCHENG).o $(SEARCHENG)Storage.o
-#else
-SEARCH_OBJS=$(SEARCHENG)
-#endif
-
-NORMAL_SRCS = \
-	AttributeData.C \
-	AttributeList.C \
-	AttributeRec.C \
-	BookCaseDB.C \
-	BookTasks.C \
-	BTCollectable.C \
-	ConcatTask.C \
-	Content.C \
-	OL_DataExpr.C \
-	ContentType.C \
-	DataBase.C \
-	DataTask.C \
-	DataRepository.C \
-	Dispatch.C \
-	EntityList.C \
-	Expression.C \
-	ExprList.C \
-	FirstOf.C \
-	FlexBuffer.C \
-	GenericId.C \
-	gr_type.C \
-	GraphicsTask.C \
-	Handler.C \
-	LcfTask.C \
-	NodeData.C \
-	NodeTask.C \
-	OL-Data.C \
-	OLAF.C \
-	ReplaceIdIdref.C \
-	SGMLDefn.C \
-	SGMLName.C \
-	SearchEng.C \
-	SearchPath.C \
-	SearchStorage.C \
-	StringList.C \
-	StyleTask.C \
-	StyleTaskDB.C \
-	StyleValidate.C \
-	TOCTask.C \
-	Task.C \
-	Token.C \
-	lex.C
-
-NORMAL_OBJS = $(NORMAL_SRCS:.C=.o) $(SEARCH_OBJS)
-
-SRCS=$(NORMAL_SRCS) $(SEARCH_SRCS)
-#ifndef DtinfoClient
-OBJS=$(NORMAL_OBJS) PostScript.o
-#else
-OBJS=$(NORMAL_OBJS)
-#endif
-
-CMD_SRCS = NodeParser.C \
-	NCFGen.C \
-	MixedGen.C \
-	RemoteId.C \
-	StyleUpdate.C
-CMD_OBJS = $(CMD_SRCS:.C=.o)
-
-XCOMM #######################################
-XCOMM Template handling
-XCOMM #######################################
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
-all::$(CMD_OBJS)
-SimpleLibraryT(OLAFParse,$(OBJS),$(LIBDIR))
-SimpleCPlusPlusProgram(NodeParser, NodeParser.o libOLAFParse.a libOLAFParseT.a,$(Libs))
-SimpleCPlusPlusProgram(NCFGen, NCFGen.o libOLAFParse.a libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
-SimpleCPlusPlusProgram(MixedGen, MixedGen.o RemoteId.o libOLAFParse.a libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
-SimpleCPlusPlusProgram(StyleUpdate, StyleUpdate.o libOLAFParse.a libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
-#elif defined(LinuxArchitecture) || defined(BSDArchitecture) || \
-      defined(SunArchitecture)
-TEMPLATE_OBJS = TKTemplate.o
-RealLibrary(OLAFParse,$(OBJS),$(LIBDIR))
-SimpleCPlusPlusProgram(NodeParser, NodeParser.o $(TEMPLATE_OBJS) libOLAFParse.a,$(Libs))
-SimpleCPlusPlusProgram(NCFGen, NCFGen.o $(TEMPLATE_OBJS) libOLAFParse.a,$(Libs) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB))
-SimpleCPlusPlusProgram(MixedGen, MixedGen.o RemoteId.o $(TEMPLATE_OBJS) libOLAFParse.a,$(Libs) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB))
-SimpleCPlusPlusProgram(StyleUpdate, StyleUpdate.o $(TEMPLATE_OBJS) libOLAFParse.a,$(Libs) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB))
-#else
-TEMPLATE_OBJS = TKTemplate.o
-RealLibrary(OLAFParse,$(OBJS),$(LIBDIR))
-SimpleCPlusPlusProgram(NodeParser, NodeParser.o $(TEMPLATE_OBJS) libOLAFParse.a,$(Libs))
-SimpleCPlusPlusProgram(NCFGen, NCFGen.o $(TEMPLATE_OBJS) libOLAFParse.a,$(Libs) $(DTSVCLIB) $(TTLIB))
-SimpleCPlusPlusProgram(MixedGen, MixedGen.o RemoteId.o $(TEMPLATE_OBJS) libOLAFParse.a,$(Libs) $(DTSVCLIB) $(TTLIB))
-SimpleCPlusPlusProgram(StyleUpdate, StyleUpdate.o $(TEMPLATE_OBJS) libOLAFParse.a,$(Libs) $(DTSVCLIB) $(TTLIB))
-#ifdef HPArchitecture
-SpecialCPlusPlusObjectRule($(TEMPLATE_OBJS),,+pti all_tmpls)
-#else
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4
-SpecialCPlusPlusObjectRule($(TEMPLATE_OBJS),,+Tall_tmpls)
-#endif
-#endif
-#endif
-
-XCOMM  lex.C gr_type.C ReplaceIdIdref.C ContentType.C RemoteId.C
-XCOMM  and OL_DataExpr.C are generated from flex and byacc files
-#ifdef RegenParserFiles
-SimpleCPlusPlusLexTarget(lex)
-LexTarget (gr_type,graphics_task)
-LexTarget (ReplaceIdIdref,nodedata)
-LexTarget (ContentType,ol_data)
-LexTarget (RemoteId,remote)
-YaccTarget(OL_DataExpr,ol_data)
-#else
-OL_DataExpr.o : OL_DataExpr.C
-	CplusObjectCompile($(_NOOP_))
-ContentType.o : ContentType.C
-	CplusObjectCompile($(_NOOP_))
-gr_type.o : gr_type.C
-	CplusObjectCompile($(_NOOP_))
-ReplaceIdIdref.o : ReplaceIdIdref.C
-	CplusObjectCompile($(_NOOP_))
-lex.o : lex.C
-	CplusObjectCompile($(_NOOP_))
-RemoteId.o : RemoteId.C
-	CplusObjectCompile($(_NOOP_))
-#endif
-
-XCOMM This passes BookTasks.C the necessary flag to compile-in licensing
-SpecialCPlusPlusObjectRule(BookTasks.o,,$(LIC_FLAGS))
-
-InstallBuildToolsBinary(NodeParser)
-InstallBuildToolsBinary(NCFGen)
-InstallBuildToolsBinary(MixedGen)
-InstallBuildToolsBinary(StyleUpdate)
-InstallBuildToolsScript(dtinfogen)
-InstallBuildToolsBinary(dtinfogen_worker)
-#ifndef DtinfoClient
-InstallMultipleDest(install_buildtools,psbox.ps,$(INSTALL_ETC_DIR))
-#endif
-
-
-XCOMM symlinks used by dtinfogen when run from the build tree
-
-LinkSourceFile(hardcopy.feature.spec,$(CDELIBSRC)/DtMmdb/StyleSheet)
-LinkSourceFile(online.feature.spec,$(CDELIBSRC)/DtMmdb/StyleSheet)
-LinkSourceFile(mmdb.infolib.spec,$(CDELIBSRC)/DtMmdb/oliasdb)
-LinkSourceFile(dtsr,$(PROGRAMSRC))
-LinkFile(C.ISO-8859-1,$(PROGRAMSRC)/localized/C)
-LinkFile(de_DE.UTF-8,$(PROGRAMSRC)/localized/de_DE.UTF-8)
-LinkFile(es_ES.UTF-8,$(PROGRAMSRC)/localized/es_ES.UTF-8)
-LinkFile(fr_FR.UTF-8,$(PROGRAMSRC)/localized/fr_FR.UTF-8)
-LinkFile(it_IT.UTF-8,$(PROGRAMSRC)/localized/it_IT.UTF-8)
-LinkFile(ja_JP.EUC-JP,$(PROGRAMSRC)/localized/ja_JP.dt-eucJP)
-LinkFile(C,C.ISO-8859-1)
-
-#if defined(SunArchitecture)
-SYS_LIBRARIES = -lgen
-#endif
-
-DEPLIBS2 = $(DEPDTSVCLIB) $(DEPTTLIB) /* $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) */
-LOCAL_LIBRARIES2 = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB)
-
-SRCS2 = dtinfogen_worker.c
-OBJS2 = dtinfogen_worker.o
-
-AllTarget(dtinfogen_worker)
-ComplexProgramTarget_2(dtinfogen_worker,$(LOCAL_LIBRARIES2),NullParameter)
-
-clean::
-	RemoveFiles(dtinfogen_worker)
-
-DependTarget3($(NORMAL_SRCS),$(CMD_SRCS),$(SRCS2))
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am b/cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am
deleted file mode 100644
index c1f050cb7..000000000
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am
+++ /dev/null
@@ -1,88 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-dist_bin_SCRIPTS = dtinfogen
-
-libexec_PROGRAMS = MixedGen \
-		   NCFGen \
-		   NodeParser \
-		   StyleUpdate \
-		   dtinfogen_worker
-
-AM_CXXFLAGS = -DEXPAND_TEMPLATES -DDtinfoClient -I$(top_builddir)/lib/DtMmdb
-AM_LDFLAGS = $(XTOOLLIB) $(LIBMMDB) $(DTCLIENTLIBS)
-
-OLAFPARSESRC = AttributeData.C \
-	       AttributeList.C \
-	       AttributeRec.C \
-	       AusText.C \
-	       AusTextStorage.C \
-	       BookCaseDB.C \
-	       BookTasks.C \
-	       BTCollectable.C \
-	       ConcatTask.C \
-	       Content.C \
-	       OL_DataExpr.C \
-	       ContentType.C \
-	       DataBase.C \
-	       DataTask.C \
-	       DataRepository.C \
-	       Dispatch.C \
-	       EntityList.C \
-	       Expression.C \
-	       ExprList.C \
-	       FirstOf.C \
-	       FlexBuffer.C \
-	       GenericId.C \
-	       gr_type.C \
-	       GraphicsTask.C \
-	       Handler.C \
-	       LcfTask.C \
-	       NodeData.C \
-	       NodeTask.C \
-	       OL_Data.C \
-	       OLAF.C \
-	       ReplaceIdIdref.C \
-	       SGMLDefn.C \
-	       SGMLName.C \
-	       SearchEng.C \
-	       SearchPath.C \
-	       SearchStorage.C \
-	       StringList.C \
-	       StyleTask.C \
-	       StyleTaskDB.C \
-	       StyleValidate.C \
-	       TOCTask.C \
-	       Task.C \
-	       Token.C \
-	       lex.ll
-
-NodeParser_SOURCES = NodeParser.C $(OLAFPARSESRC)
-NCFGen_SOURCES = NCFGen.C $(OLAFPARSESRC)
-MixedGen_SOURCES = MixedGen.C RemoteId.C $(OLAFPARSESRC)
-StyleUpdate_SOURCES = StyleUpdate.C $(OLAFPARSESRC)
-
-AM_LFLAGS = -Cf -L -8 -s
-AM_YFLAGS = -d
-
-CLEANFILES = OL_DataExpr.C \
-	     OL_DataExpr.tab.h \
-	     ContentType.C \
-	     ReplaceIdIdref.C \
-	     RemoteId.C \
-	     gr_type.C
-
-OL_DataExpr.C: OL_DataExpr.yy
-	$(YACC) $(AM_YFLAGS) -p ol_data -b OL_DataExpr $<
-	mv OL_DataExpr.tab.c $@
-
-ContentType.C: ContentType.ll OL_DataExpr.C
-	$(LEX) $(AM_LFLAGS) -P ol_data -o $@ $<
-
-ReplaceIdIdref.C: ReplaceIdIdref.ll
-	$(LEX) $(AM_LFLAGS) -P nodedata -o $@ $<
-
-RemoteId.C: RemoteId.ll
-	$(LEX) $(AM_LFLAGS) -P remote -o $@ $<
-
-gr_type.C: gr_type.ll
-	$(LEX) $(AM_LFLAGS) -P graphics_task -o $@ $<
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/all_tmpls b/cde/programs/dtinfo/dtinfogen/infolib/etc/all_tmpls
deleted file mode 100644
index 42c6d14df..000000000
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/all_tmpls
+++ /dev/null
@@ -1,2 +0,0 @@
-// all_tmplts - force instantiation of all templates under HP-UX
-@all
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen b/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen
deleted file mode 100755
index 6d4d8a342..000000000
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen
+++ /dev/null
@@ -1,372 +0,0 @@
-#!/bin/sh
-
-###############################################################################
-#
-# $XConsortium: dtinfogen /main/10 1996/09/06 14:24:23 cde-hal $
-# $Version$
-# $XConsortium: dtinfogen /main/10 1996/09/06 14:24:23 cde-hal $ 
-#
-# Copyright (c) 1994 HaL Computer Systems, Inc.  All rights reserved.
-# UNPUBLISHED -- rights reserved under the Copyright Laws of the United
-# States.  Use of a copyright notice is precautionary only and does not
-# imply publication or disclosure.
-#
-# This software contains confidential information and trade secrets of HaL
-# Computer Systems, Inc.  Use, disclosure, or reproduction is prohibited
-# without the prior express written permission of HaL Computer Systems, Inc.
-#
-#                         RESTRICTED RIGHTS LEGEND
-# Use, duplication, or disclosure by the Government is subject to
-# restrictions as set forth in subparagraph (c)(l)(ii) of the Rights in
-# Technical Data and Computer Software clause at DFARS 252.227-7013.
-#                        HaL Computer Systems, Inc.
-#                  1315 Dell Avenue, Campbell, CA  95008               $
-#
-###############################################################################
-
-###############################################################################
-#
-#	Set up shell traps
-#
-###############################################################################
-
-RETCODE=0
-
-trap '\
-	RETCODE=${RETCODE:-$?}		;\
-        exit $RETCODE \
-' 0 1 2 3 4 5 6 7 8 10 12 15
-
-###############################################################################
-#
-#	Environment variables that this shell script sets/changes:
-#
-###############################################################################
-
-export	ARCH DTINFO_HOME OTK_NAME
-
-
-###############################################################################
-#
-#	Functions:
-#		err_f		 - reports an error message and exits
-#		msg_f		 - reports messages
-#		mybasename_f	 - returns a basename using expr in BASE
-#		mydirname_f	 - returns a path using expr in HEAD
-#					user's font path
-#		warn_f		 - reports a warning message
-#
-###############################################################################
-
-###############################################################################
-
-
-err_f () {
-
-msg_f "${OTK_NAME:-$0}: *** ERROR - $@"
-exit 3
-
-}
-
-###############################################################################
-
-msg_f () {
-
-echo "
-$@ 
-" 1>&2
-
-}
-
-###############################################################################
-
-mybasename_f() {
-
-if [ -z "$1" ] ; then
-	err_f "mybasename_f() passed an empty argument."
-fi
-
-BASE=`expr \
-	$1 : '.*/\([^/][^/]*\)$' \| \
-	$1 : '\([^/][^/]*\)$' \| \
-	"\/"`
-
-if [ "$BASE" = "\/" ] ; then
-	warn_f "mybasename_f() passed a path [$1]."
-	BASE=""
-fi
-
-}
-
-###############################################################################
-
-mydirname_f() {
-
-if [ -z "$1" ] ; then
-	err_f "mydirname_f() passed an empty path."
-fi
-
-HEAD=`expr \
-	$1 : '\(.*[^/]\)//*[^/]*$' \| \
-	$1 : '\(/\)[^/]*$' \| \
-	.`
-
-if [ "$HEAD" = "$1" ] ; then
-	HEAD="."
-elif [ -z "$HEAD" ] ; then
-	HEAD="/"
-fi
-
-}
-
-###############################################################################
-
-warn_f () {
-
-msg_f "${OTK_NAME:-$0}: *** WARNING - $@"
-
-}
-
-###############################################################################
-
-###############################################################################
-#
-#	Initialize some useful variables
-#
-###############################################################################
-
-       CMD=$0
-DTINFO_HOME=${DTINFO_HOME:-""}
-
-ARGUMENT=""
-while [ $# -gt 0 ] ; do
-	if [ -n "`echo $1 | egrep ' '`" ] ; then
-		ARGUMENT="$ARGUMENT \"$1\""
-	else
-		ARGUMENT="$ARGUMENT $1"
-	fi
-	shift
-done
-
-    THISPLACE=`pwd`
-  mydirname_f $CMD
-         HERE=`(cd $HEAD ; pwd)`
- mybasename_f $CMD
-     OTK_NAME=$BASE
-
-###############################################################################
-#
-#	Determine the OS running to see if the binary will run at all,
-#	also provide a mechanism to choose the correct binary for a
-#	particular architecture automagically.
-#
-###############################################################################
-
-          OS=`uname -sr`
-LINKTESTFLAG="-h"
-case "$OS" in
-
-	AIX*)
-		ARCH=aix
-		LINKTESTFLAG="-L"
-	;;
-
-	HP-UX*)
-		ARCH=hpux
-	;;
- 
-	IRIX*)
-		ARCH=irix
-		LINKTESTFLAG="-l"
-	;;
- 
-	SunOS\ 4.1*)
-		ARCH=sunos
-	;;
-
-	SunOS\ 5*)
-		case "`uname -m`" in
- 
-			hal*) 
-				ARCH=halos
-			;;
- 
-			i86*)
-				ARCH=solaris-386
-			;;
- 
-			sun4*) 
-				ARCH=solaris
-			;;
-		esac
-	;;
-
-	*4.2MP)
-		ARCH=mips
-	;;
-
-	Linux*)
-		case "`uname -i`" in
-
-			i386*)
-				ARCH=i386
-			;;
-
-			x86_64*)
-				ARCH=amd64
-			;;
-
-			*)
-				ARCH=unknown
-			;;
-		esac
-	;;
-
-	FreeBSD*)
-		case "`uname -m`" in
-
-			i386*)
-				ARCH=i386
-			;;
-
-			amd64*)
-				ARCH=amd64
-			;;
-
-			*)
-				ARCH=unknown
-			;;
-		esac
-	;;
-
-	OpenBSD*)
-		case "`uname -m`" in
-
-			i386*)
-				ARCH=i386
-			;;
-
-			amd64*)
-				ARCH=amd64
-			;;
-
-			powerpc*)
-				ARCH=powerpc
-			;;
-
-			*)
-				ARCH=unknown
-			;;
-		esac
-	;;
-
-	NetBSD*)
-		case "`uname -m`" in
-
-			i386*)
-				ARCH=i386
-			;;
-
-			amd64*)
-				ARCH=amd64
-			;;
-
-			*)
-				ARCH=unknown
-			;;
-		esac
-	;;
-
-	*)
-		err_f "Does not run under [$OS]"
-	;;
-esac
-
-	
-###############################################################################
-#
-#	Find the toolkit's real home.
-#
-###############################################################################
-
-if [ $LINKTESTFLAG $CMD -a -z "$DTINFO_HOME" ] ; then
-	cd $HERE
-	while [ $LINKTESTFLAG $OTK_NAME ] ; do
-		OLD=$CMD
-		CMD=`ls -l $OTK_NAME | sed -e 's/.*->[ ]*//g'`
-		mydirname_f $CMD
-		cd $HEAD
-		mybasename_f $CMD
-		OTK_NAME=$BASE
-		HEAD=`pwd`
-		 CMD=$HEAD/$OTK_NAME
-	done
-	mydirname_f $HEAD
-
-elif [ -z "$DTINFO_HOME" ] ; then
-
-	#######################################################################
-	#
-	#	An explicit path has been given, but the environment variable
-	#	is not set.
-	#
-	#######################################################################
-
-	if [ "$HERE" = "." ] ; then
-		HERE=`pwd`
-	elif [ `expr $HERE : '.*\.\..*'` -gt 0 ] ; then
-		cd $HERE
-		HERE=`pwd`
-	fi
-	mydirname_f $HERE
-
-else
-
-	if [ -d $DTINFO_HOME ] ; then
-	
-		cd $DTINFO_HOME
-		DTINFO_HOME=`pwd`
-
-	else
-
-		err_f "The DtInfo ToolKit does not appear to be installed
-correctly in [$DTINFO_HOME].  Set the environment variable, 
-DTINFO_HOME, to the directory where the DtInfo ToolKit is installed, 
-or use a fully qualified path when invoking [otk]."
-
-	fi
-
-fi
-
-###############################################################################
-#
-#	Look in a default place if DTINFO_HOME not set.
-#	Set path to default information library
-#	Add DTINFO_BIN to path
-#
-###############################################################################
-
-DTINFO_HOME=${DTINFO_HOME:-$HEAD}
- DTINFO_BIN=${DTINFO_BIN:-$DTINFO_HOME/bin}
-# the infolib/etc dir contains most library and bin type files
- DTINFO_LIB=${DTINFO_LIB:-$DTINFO_HOME/infolib/etc}
-      PATH=${DTINFO_BIN}:${DTINFO_LIB}:${PATH}
-
-if [ ! -d $DTINFO_LIB ] ; then
-
-	err_f "The $ARCH binaries were not installed in
-               $DTINFO_BIN"
-
-fi
-
-###############################################################################
-#
-#	Create the command line and invoke the DtInfo build tools
-#
-###############################################################################
-
-cd $THISPLACE
-eval $DTINFO_LIB/dtinfogen_worker $ARGUMENT
-RETCODE=$?
-
-exit $RETCODE
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/ja_JP.EUC-JP/Makefile.am b/cde/programs/dtinfo/dtinfogen/infolib/ja_JP.EUC-JP/Makefile.am
deleted file mode 100644
index 8d662750b..000000000
--- a/cde/programs/dtinfo/dtinfogen/infolib/ja_JP.EUC-JP/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = SGML
diff --git a/cde/programs/dtinfo/dtinfogen/install/Imakefile b/cde/programs/dtinfo/dtinfogen/install/Imakefile
deleted file mode 100644
index ec02fdca1..000000000
--- a/cde/programs/dtinfo/dtinfogen/install/Imakefile
+++ /dev/null
@@ -1,225 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/13 1996/10/09 14:13:10 drk $
-XCOMM
-XCOMM 
-XCOMM Copyright (c) 1993 HAL Computer Systems International, Ltd.
-XCOMM All rights reserved.  Unpublished -- rights reserved under
-XCOMM the Copyright Laws of the United States.  USE OF A COPYRIGHT
-XCOMM NOTICE IS PRECAUTIONARY ONLY AND DOES NOT IMPLY PUBLICATION
-XCOMM OR DISCLOSURE.
-XCOMM 
-XCOMM THIS SOFTWARE CONTAINS CONFIDENTIAL INFORMATION AND TRADE
-XCOMM SECRETS OF HAL COMPUTER SYSTEMS INTERNATIONAL, LTD.  USE,
-XCOMM DISCLOSURE, OR REPRODUCTION IS PROHIBITED WITHOUT THE
-XCOMM PRIOR EXPRESS WRITTEN PERMISSION OF HAL COMPUTER SYSTEMS
-XCOMM INTERNATIONAL, LTD.
-XCOMM 
-XCOMM                         RESTRICTED RIGHTS LEGEND
-XCOMM Use, duplication, or disclosure by the Government is subject
-XCOMM to the restrictions as set forth in subparagraph (c)(l)(ii)
-XCOMM of the Rights in Technical Data and Computer Software clause
-XCOMM at DFARS 252.227-7013.
-XCOMM
-XCOMM          HAL COMPUTER SYSTEMS INTERNATIONAL, LTD.
-XCOMM                  1315 Dell Avenue
-XCOMM                  Campbell, CA  95008
-XCOMM 
-XCOMM 
-
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-NormalCplusplusObjectRule()
-
-INCLUDES=$(CXXDEPENDINCLUDES) $(GLOBAL_INCLUDES) $(MMDB_INCLUDES) $(EXCEPTIONS_INCLUDES)
-
-
- 
-MMDB_DIR=../../mmdb
-
-#ifdef AIXArchitecture
-
-API_OBJS = \
-	$(MMDB_DIR)/api/base.o			$(MMDB_DIR)/api/info_base.o \
-	$(MMDB_DIR)/api/info_lib.o			$(MMDB_DIR)/api/smart_ptr.o \
-	$(MMDB_DIR)/api/transaction.o		$(MMDB_DIR)/api/utility.o
-
-BTREE_OBJS = \
-	$(MMDB_DIR)/btree/mmdb_btree.o
-
-#if !defined(AIXArchitecture)
-EXTRA_BTREE_BERKELEY_OBJS = $(MMDB_DIR)/btree_berkeley/memmove.o
-#endif
-
-BTREE_BERKELEY_OBJS = \
-	$(MMDB_DIR)/btree_berkeley/bt_close.o	$(MMDB_DIR)/btree_berkeley/bt_conv.o \
-	$(MMDB_DIR)/btree_berkeley/bt_debug.o	$(MMDB_DIR)/btree_berkeley/bt_delete.o \
-	$(MMDB_DIR)/btree_berkeley/bt_get.o		$(MMDB_DIR)/btree_berkeley/bt_open.o \
-	$(MMDB_DIR)/btree_berkeley/bt_overflow.o	$(MMDB_DIR)/btree_berkeley/bt_page.o \
-	$(MMDB_DIR)/btree_berkeley/bt_put.o		$(MMDB_DIR)/btree_berkeley/bt_search.o \
-	$(MMDB_DIR)/btree_berkeley/bt_seq.o		$(MMDB_DIR)/btree_berkeley/bt_split.o \
-	$(MMDB_DIR)/btree_berkeley/bt_stack.o	$(MMDB_DIR)/btree_berkeley/bt_utils.o \
-	$(MMDB_DIR)/btree_berkeley/mktemp.o		$(MMDB_DIR)/btree_berkeley/realloc.o \
-	$(MMDB_DIR)/btree_berkeley/snprintf.o	$(EXTRA_BTREE_BERKELEY_OBJS) \
-	$(MMDB_DIR)/btree_berkeley/mpool.o		$(MMDB_DIR)/btree_berkeley/db.o
-
-COMPRESSION_OBJS = \
-	$(MMDB_DIR)/compression/abs_agent.o		$(MMDB_DIR)/compression/zip.o \
-	$(MMDB_DIR)/compression/huffman.o		$(MMDB_DIR)/compression/trie.o \
-	$(MMDB_DIR)/compression/code.o		$(MMDB_DIR)/compression/lzss.o \
-	$(MMDB_DIR)/compression/sgml.o		$(MMDB_DIR)/compression/ps.o
-
-DISKHASH_OBJS = \
-	$(MMDB_DIR)/diskhash/disk_bucket.o		$(MMDB_DIR)/diskhash/bucket_array.o \
-	$(MMDB_DIR)/diskhash/disk_hash.o
-
-DSTR_OBJS = \
-	$(MMDB_DIR)/dstr/set.o			$(MMDB_DIR)/dstr/bset.o \
-	$(MMDB_DIR)/dstr/slist.o			$(MMDB_DIR)/dstr/dlist_cell.o \
-	$(MMDB_DIR)/dstr/dlist.o			$(MMDB_DIR)/dstr/heap.o \
-	$(MMDB_DIR)/dstr/void_ptr_array.o		$(MMDB_DIR)/dstr/void_ptr_stack.o \
-	$(MMDB_DIR)/dstr/memory_pool.o		$(MMDB_DIR)/dstr/dstr_test.o \
-	$(MMDB_DIR)/dstr/index_agent.o		$(MMDB_DIR)/dstr/token_stack.o \
-	$(MMDB_DIR)/dstr/slist_char_ptr_cell.o
-
-DTI_EXCS_OBJS = \
-	$(MMDB_DIR)/dti_excs/Jump_Environment.o	$(MMDB_DIR)/dti_excs/Exceptions.o \
-	$(MMDB_DIR)/dti_excs/Exception.o		$(MMDB_DIR)/dti_excs/Destructable.o \
-	$(MMDB_DIR)/dti_excs/terminate.o
-
-DYNHASH_OBJS = \
-	$(MMDB_DIR)/dynhash/data_t.o		$(MMDB_DIR)/dynhash/imp_bucket.o \
-	$(MMDB_DIR)/dynhash/imp_die.o
-
-HMPHF_OBJS = \
-	$(MMDB_DIR)/hmphf/buckets.o			$(MMDB_DIR)/hmphf/mphf_funcs.o \
-	$(MMDB_DIR)/hmphf/mphf_hash_table.o		$(MMDB_DIR)/hmphf/params.o \
-	$(MMDB_DIR)/hmphf/pattern.o			$(MMDB_DIR)/hmphf/sorter.o
-
-INDEX_OBJS = \
-	$(MMDB_DIR)/index/btree_index.o		$(MMDB_DIR)/index/dyn_disk_index.o \
-	$(MMDB_DIR)/index/dyn_index.o		$(MMDB_DIR)/index/dyn_memory_index.o \
-	$(MMDB_DIR)/index/fast_mphf.o		$(MMDB_DIR)/index/hash.o \
-	$(MMDB_DIR)/index/index.o			$(MMDB_DIR)/index/inv_lists.o \
-	$(MMDB_DIR)/index/mphf_index.o
-
-MGRS_OBJS = \
-	$(MMDB_DIR)/mgrs/managers.o			$(MMDB_DIR)/mgrs/misc.o \
-	$(MMDB_DIR)/mgrs/query_mgr.o		$(MMDB_DIR)/mgrs/template_mgr.o
-
-MISC_OBJS = \
-	$(MMDB_DIR)/misc/unique_id.o
-
-OBJECT_OBJS = \
-	$(MMDB_DIR)/object/composite.o		$(MMDB_DIR)/object/compressed_pstring.o \
-	$(MMDB_DIR)/object/cset.o			$(MMDB_DIR)/object/dl_list.o \
-	$(MMDB_DIR)/object/dl_list_cell.o		$(MMDB_DIR)/object/handler.o \
-	$(MMDB_DIR)/object/integer.o		$(MMDB_DIR)/object/long_pstring.o \
-	$(MMDB_DIR)/object/oid.o			$(MMDB_DIR)/object/oid_list.o \
-	$(MMDB_DIR)/object/oid_t.o			$(MMDB_DIR)/object/primitive.o \
-	$(MMDB_DIR)/object/pstring.o		$(MMDB_DIR)/object/random_gen.o \
-	$(MMDB_DIR)/object/root.o			$(MMDB_DIR)/object/short_list.o \
-	$(MMDB_DIR)/object/tuple.o
-
-OLIASDB_OBJS = \
-	$(MMDB_DIR)/oliasdb/asciiIn_filters.o 	$(MMDB_DIR)/oliasdb/collectionIterator.o \
-	$(MMDB_DIR)/oliasdb/dlp_hd.o 		$(MMDB_DIR)/oliasdb/dlp_test.o \
-	$(MMDB_DIR)/oliasdb/doc_hd.o 		$(MMDB_DIR)/oliasdb/doc_test.o \
-	$(MMDB_DIR)/oliasdb/graphic_hd.o 		$(MMDB_DIR)/oliasdb/graphic_test.o \
-	$(MMDB_DIR)/oliasdb/loc_test.o 		$(MMDB_DIR)/oliasdb/locator_hd.o \
-	$(MMDB_DIR)/oliasdb/mark.o 			$(MMDB_DIR)/oliasdb/mark_base.o  \
-	$(MMDB_DIR)/oliasdb/mark_test.o 		$(MMDB_DIR)/oliasdb/mmdb.o \
-	$(MMDB_DIR)/oliasdb/node_hd.o 		$(MMDB_DIR)/oliasdb/node_test.o \
-	$(MMDB_DIR)/oliasdb/olias_funcs.o 		$(MMDB_DIR)/oliasdb/olias_test.o \
-	$(MMDB_DIR)/oliasdb/stylesheet_hd.o 	$(MMDB_DIR)/oliasdb/stylesheet_test.o \
-	$(MMDB_DIR)/oliasdb/toc_hd.o 		$(MMDB_DIR)/oliasdb/toc_test.o \
-	$(MMDB_DIR)/oliasdb/user_base.o
-
-SCHEMA_OBJS = \
-	$(MMDB_DIR)/schema/desc.o			$(MMDB_DIR)/schema/store_desc.o \
-	$(MMDB_DIR)/schema/object_dict.o		$(MMDB_DIR)/schema/stored_object_desc.o \
-	$(MMDB_DIR)/schema/index_desc.o		$(MMDB_DIR)/schema/inv_desc.o \
-	$(MMDB_DIR)/schema/agent_desc.o		$(MMDB_DIR)/schema/container_desc.o \
-	$(MMDB_DIR)/schema/sheet.o			$(MMDB_DIR)/schema/token.o
-
-STORAGE_OBJS = \
-	$(MMDB_DIR)/storage/abs_storage.o		$(MMDB_DIR)/storage/chunks_index.o	\
-	$(MMDB_DIR)/storage/heap_comp_funcs.o	$(MMDB_DIR)/storage/lru.o \
-	$(MMDB_DIR)/storage/page.o			$(MMDB_DIR)/storage/page_cache.o \
-	$(MMDB_DIR)/storage/page_rep.o		$(MMDB_DIR)/storage/page_storage.o \
-	$(MMDB_DIR)/storage/rep_cell.o		$(MMDB_DIR)/storage/rep_policy.o \
-	$(MMDB_DIR)/storage/store_test.o		$(MMDB_DIR)/storage/unixf_storage.o \
-	$(MMDB_DIR)/storage/version.o		$(MMDB_DIR)/storage/vm_storage.o
-
-UTILITY_OBJS = \
-	$(MMDB_DIR)/utility/funcs.o			$(MMDB_DIR)/utility/ostring.o \
-	$(MMDB_DIR)/utility/pm_random.o		$(MMDB_DIR)/utility/atoi_pearson.o \
-	$(MMDB_DIR)/utility/xtime.o			$(MMDB_DIR)/utility/buffer.o \
-	$(MMDB_DIR)/utility/atoi_larson.o		$(MMDB_DIR)/utility/atomic_lock.o \
-	$(MMDB_DIR)/utility/rw_lock.o		$(MMDB_DIR)/utility/atoi_fast.o \
-	$(MMDB_DIR)/utility/filter.o		$(MMDB_DIR)/utility/mmdb_exception.o \
-	$(MMDB_DIR)/utility/randomize.o
-
-DTI_CC_OBJS = \
-	$(MMDB_DIR)/dti_cc/CC_Listbase.o		$(MMDB_DIR)/dti_cc/cc_exceptions.o \
-	$(MMDB_DIR)/dti_cc/CC_String.o		$(MMDB_DIR)/dti_cc/CC_Tokenizer.o \
-	$(MMDB_DIR)/dti_cc/CC_Stack.o		$(MMDB_DIR)/dti_cc/CC_Slist.o
-
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
-EXTRA_HARDCOPY_OBJS = $(MMDB_DIR)/HardCopy/TemplatesAutoNumber.o
-#endif
-
-HARDCOPY_OBJS = \
-	$(MMDB_DIR)/HardCopy/FPset.o		$(MMDB_DIR)/HardCopy/HardCopyFP.o \
-	$(MMDB_DIR)/HardCopy/autoNumber.o		$(MMDB_DIR)/HardCopy/autoNumberFP.o \
-	$(EXTRA_HARDCOPY_OBJS)
-
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
-EXTRA_STYLESHEET_OBJS = $(MMDB_DIR)/StyleSheet/SSTemplates.o
-#endif
-
-STYLESHEET_OBJS = \
-	$(MMDB_DIR)/StyleSheet/Attribute.o		$(MMDB_DIR)/StyleSheet/AttributeList.o \
-	$(MMDB_DIR)/StyleSheet/BitVector.o		$(MMDB_DIR)/StyleSheet/DocParser.o \
-	$(MMDB_DIR)/StyleSheet/Element.o		$(MMDB_DIR)/StyleSheet/Expression.o \
-	$(MMDB_DIR)/StyleSheet/Feature.o		$(MMDB_DIR)/StyleSheet/FeatureDefDictionary.o \
-	$(MMDB_DIR)/StyleSheet/FeatureSet.o		$(MMDB_DIR)/StyleSheet/FeatureValue.o \
-	$(MMDB_DIR)/StyleSheet/PathQualifier.o		$(MMDB_DIR)/StyleSheet/PathTable.o \
-	$(MMDB_DIR)/StyleSheet/Resolver.o		$(MMDB_DIR)/StyleSheet/ResolverStack.o \
-	$(MMDB_DIR)/StyleSheet/SSPath.o			$(MMDB_DIR)/StyleSheet/StyleSheet.o \
-	$(MMDB_DIR)/StyleSheet/StyleSheetExceptions.o \
-	$(MMDB_DIR)/StyleSheet/SymTab.o			$(MMDB_DIR)/StyleSheet/VariableTable.o \
-	$(MMDB_DIR)/StyleSheet/defParser.o		$(MMDB_DIR)/StyleSheet/defToken.o \
-	$(MMDB_DIR)/StyleSheet/style.o			$(MMDB_DIR)/StyleSheet/tokenStyle.o \
-	$(MMDB_DIR)/StyleSheet/RendererHCV.o	$(EXTRA_STYLESHEET_OBJS)
-
-MMDB_OBJS = $(HARDCOPY_OBJS) $(STYLESHEET_OBJS) $(DTI_CC_OBJS)
-
-ALL_MMDB_OBJS =	$(API_OBJS)		$(BTREE_OBJS) \
-	$(BTREE_BERKELEY_OBJS)	$(COMPRESSION_OBJS) \
-	$(DISKHASH_OBJS)	$(DSTR_OBJS) \
-	$(DTI_EXCS_OBJS) 	$(DYNHASH_OBJS) \
-	$(HMPHF_OBJS)		$(INDEX_OBJS) \
-	$(MGRS_OBJS)		$(MISC_OBJS) \
-	$(OBJECT_OBJS)		$(OLIASDB_OBJS) \
-	$(SCHEMA_OBJS)		$(STORAGE_OBJS) \
-	$(UTILITY_OBJS)		$(MMDB_OBJS)
-#endif
-
-#ifdef AIXArchitecture
-Libs=$(ALL_MMDB_OBJS) $(DTSVCLIB) $(TTLIB) $(MATH_LIB)
-#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
-Libs=$(MMDB_LIBS) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB) $(MATH_LIB)
-#else
-Libs=$(MMDB_LIBS) $(DTSVCLIB) $(TTLIB) $(MATH_LIB)
-#endif
-
-SimpleCPlusPlusProgram(valBase,valBase.o,$(Libs))
-
-InstallBuildToolsBinary(valBase)
-
-InstallPlatformBuildToolsScript(DeInstallBase)
-InstallPlatformBuildToolsScript(ChangeCaseTitle)
-InstallPlatformBuildToolsScript(Librarian)
-
-SRCS = valBase.C
-
-DependTarget()
diff --git a/cde/programs/dtinfo/dtinfogen/install/Makefile.am b/cde/programs/dtinfo/dtinfogen/install/Makefile.am
deleted file mode 100644
index c4f5f2b32..000000000
--- a/cde/programs/dtinfo/dtinfogen/install/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-# get our env variables
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc
-infolib_PROGRAMS = valBase
-
-valBase_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
-valBase_LDADD = $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB)
-valBase_SOURCES = valBase.C
-
-infolib_SCRIPTS = DeInstallBase ChangeCaseTitle Librarian
-
diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/Imakefile b/cde/programs/dtinfo/dtinfogen/mmdb/Imakefile
deleted file mode 100644
index 057f8c239..000000000
--- a/cde/programs/dtinfo/dtinfogen/mmdb/Imakefile
+++ /dev/null
@@ -1,22 +0,0 @@
-XCOMM $TOG: Imakefile /main/7 1998/08/10 15:55:12 mgreess $
-
-#define IHaveSubdirs
-#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' 'CXXDEBUGFLAGS=$(CXXDEBUGFLAGS)'
-
-SUBDIRS=src StyleSheet
-
-XCOMM redefine TopLevelProject to build DtInfo with standard CDE config dir
-#undef  TopLevelProject
-#define TopLevelProject		DtInfo
-IMAKE_DEF_DTINFO =  -DTopLevelProject=TopLevelProject \
-		    -DProjectTmplFile='<DtInfo.tmpl>' \
-		    -DProjectRulesFile='<DtInfo.rules>'
-
-XCOMM Variables to switch on debug mode temporarily
-XCOMM CDEBUGFLAGS = -g -DDEBUG
-XCOMM CXXDEBUGFLAGS = -g -DDEBUG
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-NamedTargetSubdirs(install_buildtools,$(SUBDIRS),\
-                   install_buildtools,,install_buildtools)
diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/Makefile.am b/cde/programs/dtinfo/dtinfogen/mmdb/Makefile.am
deleted file mode 100644
index 12d8c158b..000000000
--- a/cde/programs/dtinfo/dtinfogen/mmdb/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = src StyleSheet
diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Imakefile b/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Imakefile
deleted file mode 100644
index 2f51e267c..000000000
--- a/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Imakefile
+++ /dev/null
@@ -1,203 +0,0 @@
-XCOMM $TOG: Imakefile /main/14 1997/09/05 11:32:36 samborn $
-
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-NormalCplusplusObjectRule()
-
-INCLUDES=$(CXXDEPENDINCLUDES) $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)
-
-DEFINES=-DCDE_NEXT
-
-#if defined(CplusplusCompilerMajorVersion) && (CplusplusCompilerMajorVersion > 3)
-TEMPLATE_OBJS=
-#else
-TEMPLATE_OBJS=$(OLIAS)/mmdb/StyleSheet/SSTemplates.o
-#endif
- 
-MMDB_DIR=../../../mmdb
-
-#ifdef AIXArchitecture
-
-API_OBJS = \
-	$(MMDB_DIR)/api/base.o			$(MMDB_DIR)/api/info_base.o \
-	$(MMDB_DIR)/api/info_lib.o			$(MMDB_DIR)/api/smart_ptr.o \
-	$(MMDB_DIR)/api/transaction.o		$(MMDB_DIR)/api/utility.o
-
-BTREE_OBJS = \
-	$(MMDB_DIR)/btree/mmdb_btree.o
-
-#if !defined(AIXArchitecture)
-EXTRA_BTREE_BERKELEY_OBJS = $(MMDB_DIR)/btree_berkeley/memmove.o
-#endif
-
-BTREE_BERKELEY_OBJS = \
-	$(MMDB_DIR)/btree_berkeley/bt_close.o	$(MMDB_DIR)/btree_berkeley/bt_conv.o \
-	$(MMDB_DIR)/btree_berkeley/bt_debug.o	$(MMDB_DIR)/btree_berkeley/bt_delete.o \
-	$(MMDB_DIR)/btree_berkeley/bt_get.o		$(MMDB_DIR)/btree_berkeley/bt_open.o \
-	$(MMDB_DIR)/btree_berkeley/bt_overflow.o	$(MMDB_DIR)/btree_berkeley/bt_page.o \
-	$(MMDB_DIR)/btree_berkeley/bt_put.o		$(MMDB_DIR)/btree_berkeley/bt_search.o \
-	$(MMDB_DIR)/btree_berkeley/bt_seq.o		$(MMDB_DIR)/btree_berkeley/bt_split.o \
-	$(MMDB_DIR)/btree_berkeley/bt_stack.o	$(MMDB_DIR)/btree_berkeley/bt_utils.o \
-	$(MMDB_DIR)/btree_berkeley/mktemp.o		$(MMDB_DIR)/btree_berkeley/realloc.o \
-	$(MMDB_DIR)/btree_berkeley/snprintf.o	$(EXTRA_BTREE_BERKELEY_OBJS) \
-	$(MMDB_DIR)/btree_berkeley/mpool.o		$(MMDB_DIR)/btree_berkeley/db.o
-
-COMPRESSION_OBJS = \
-	$(MMDB_DIR)/compression/abs_agent.o		$(MMDB_DIR)/compression/zip.o \
-	$(MMDB_DIR)/compression/huffman.o		$(MMDB_DIR)/compression/trie.o \
-	$(MMDB_DIR)/compression/code.o		$(MMDB_DIR)/compression/lzss.o \
-	$(MMDB_DIR)/compression/sgml.o		$(MMDB_DIR)/compression/ps.o
-
-DISKHASH_OBJS = \
-	$(MMDB_DIR)/diskhash/disk_bucket.o		$(MMDB_DIR)/diskhash/bucket_array.o \
-	$(MMDB_DIR)/diskhash/disk_hash.o
-
-DSTR_OBJS = \
-	$(MMDB_DIR)/dstr/set.o			$(MMDB_DIR)/dstr/bset.o \
-	$(MMDB_DIR)/dstr/slist.o			$(MMDB_DIR)/dstr/dlist_cell.o \
-	$(MMDB_DIR)/dstr/dlist.o			$(MMDB_DIR)/dstr/heap.o \
-	$(MMDB_DIR)/dstr/void_ptr_array.o		$(MMDB_DIR)/dstr/void_ptr_stack.o \
-	$(MMDB_DIR)/dstr/memory_pool.o		$(MMDB_DIR)/dstr/dstr_test.o \
-	$(MMDB_DIR)/dstr/index_agent.o		$(MMDB_DIR)/dstr/token_stack.o \
-	$(MMDB_DIR)/dstr/slist_char_ptr_cell.o
-
-DTI_EXCS_OBJS = \
-	$(MMDB_DIR)/dti_excs/Jump_Environment.o	$(MMDB_DIR)/dti_excs/Exceptions.o \
-	$(MMDB_DIR)/dti_excs/Exception.o		$(MMDB_DIR)/dti_excs/Destructable.o \
-	$(MMDB_DIR)/dti_excs/terminate.o
-
-DYNHASH_OBJS = \
-	$(MMDB_DIR)/dynhash/data_t.o		$(MMDB_DIR)/dynhash/imp_bucket.o \
-	$(MMDB_DIR)/dynhash/imp_die.o
-
-HMPHF_OBJS = \
-	$(MMDB_DIR)/hmphf/buckets.o			$(MMDB_DIR)/hmphf/mphf_funcs.o \
-	$(MMDB_DIR)/hmphf/mphf_hash_table.o		$(MMDB_DIR)/hmphf/params.o \
-	$(MMDB_DIR)/hmphf/pattern.o			$(MMDB_DIR)/hmphf/sorter.o
-
-INDEX_OBJS = \
-	$(MMDB_DIR)/index/btree_index.o		$(MMDB_DIR)/index/dyn_disk_index.o \
-	$(MMDB_DIR)/index/dyn_index.o		$(MMDB_DIR)/index/dyn_memory_index.o \
-	$(MMDB_DIR)/index/fast_mphf.o		$(MMDB_DIR)/index/hash.o \
-	$(MMDB_DIR)/index/index.o			$(MMDB_DIR)/index/inv_lists.o \
-	$(MMDB_DIR)/index/mphf_index.o
-
-MGRS_OBJS = \
-	$(MMDB_DIR)/mgrs/managers.o			$(MMDB_DIR)/mgrs/misc.o \
-	$(MMDB_DIR)/mgrs/query_mgr.o		$(MMDB_DIR)/mgrs/template_mgr.o
-
-MISC_OBJS = \
-	$(MMDB_DIR)/misc/unique_id.o
-
-OBJECT_OBJS = \
-	$(MMDB_DIR)/object/composite.o		$(MMDB_DIR)/object/compressed_pstring.o \
-	$(MMDB_DIR)/object/cset.o			$(MMDB_DIR)/object/dl_list.o \
-	$(MMDB_DIR)/object/dl_list_cell.o		$(MMDB_DIR)/object/handler.o \
-	$(MMDB_DIR)/object/integer.o		$(MMDB_DIR)/object/long_pstring.o \
-	$(MMDB_DIR)/object/oid.o			$(MMDB_DIR)/object/oid_list.o \
-	$(MMDB_DIR)/object/oid_t.o			$(MMDB_DIR)/object/primitive.o \
-	$(MMDB_DIR)/object/pstring.o		$(MMDB_DIR)/object/random_gen.o \
-	$(MMDB_DIR)/object/root.o			$(MMDB_DIR)/object/short_list.o \
-	$(MMDB_DIR)/object/tuple.o
-
-OLIASDB_OBJS = \
-	$(MMDB_DIR)/oliasdb/asciiIn_filters.o 	$(MMDB_DIR)/oliasdb/collectionIterator.o \
-	$(MMDB_DIR)/oliasdb/dlp_hd.o 		$(MMDB_DIR)/oliasdb/dlp_test.o \
-	$(MMDB_DIR)/oliasdb/doc_hd.o 		$(MMDB_DIR)/oliasdb/doc_test.o \
-	$(MMDB_DIR)/oliasdb/graphic_hd.o 		$(MMDB_DIR)/oliasdb/graphic_test.o \
-	$(MMDB_DIR)/oliasdb/loc_test.o 		$(MMDB_DIR)/oliasdb/locator_hd.o \
-	$(MMDB_DIR)/oliasdb/mark.o 			$(MMDB_DIR)/oliasdb/mark_base.o  \
-	$(MMDB_DIR)/oliasdb/mark_test.o 		$(MMDB_DIR)/oliasdb/mmdb.o \
-	$(MMDB_DIR)/oliasdb/node_hd.o 		$(MMDB_DIR)/oliasdb/node_test.o \
-	$(MMDB_DIR)/oliasdb/olias_funcs.o 		$(MMDB_DIR)/oliasdb/olias_test.o \
-	$(MMDB_DIR)/oliasdb/stylesheet_hd.o 	$(MMDB_DIR)/oliasdb/stylesheet_test.o \
-	$(MMDB_DIR)/oliasdb/toc_hd.o 		$(MMDB_DIR)/oliasdb/toc_test.o \
-	$(MMDB_DIR)/oliasdb/user_base.o
-
-SCHEMA_OBJS = \
-	$(MMDB_DIR)/schema/desc.o			$(MMDB_DIR)/schema/store_desc.o \
-	$(MMDB_DIR)/schema/object_dict.o		$(MMDB_DIR)/schema/stored_object_desc.o \
-	$(MMDB_DIR)/schema/index_desc.o		$(MMDB_DIR)/schema/inv_desc.o \
-	$(MMDB_DIR)/schema/agent_desc.o		$(MMDB_DIR)/schema/container_desc.o \
-	$(MMDB_DIR)/schema/sheet.o			$(MMDB_DIR)/schema/token.o
-
-STORAGE_OBJS = \
-	$(MMDB_DIR)/storage/abs_storage.o		$(MMDB_DIR)/storage/chunks_index.o	\
-	$(MMDB_DIR)/storage/heap_comp_funcs.o	$(MMDB_DIR)/storage/lru.o \
-	$(MMDB_DIR)/storage/page.o			$(MMDB_DIR)/storage/page_cache.o \
-	$(MMDB_DIR)/storage/page_rep.o		$(MMDB_DIR)/storage/page_storage.o \
-	$(MMDB_DIR)/storage/rep_cell.o		$(MMDB_DIR)/storage/rep_policy.o \
-	$(MMDB_DIR)/storage/store_test.o		$(MMDB_DIR)/storage/unixf_storage.o \
-	$(MMDB_DIR)/storage/version.o		$(MMDB_DIR)/storage/vm_storage.o
-
-UTILITY_OBJS = \
-	$(MMDB_DIR)/utility/funcs.o			$(MMDB_DIR)/utility/ostring.o \
-	$(MMDB_DIR)/utility/pm_random.o		$(MMDB_DIR)/utility/atoi_pearson.o \
-	$(MMDB_DIR)/utility/xtime.o			$(MMDB_DIR)/utility/buffer.o \
-	$(MMDB_DIR)/utility/atoi_larson.o		$(MMDB_DIR)/utility/atomic_lock.o \
-	$(MMDB_DIR)/utility/rw_lock.o		$(MMDB_DIR)/utility/atoi_fast.o \
-	$(MMDB_DIR)/utility/filter.o		$(MMDB_DIR)/utility/mmdb_exception.o \
-	$(MMDB_DIR)/utility/randomize.o
-
-DTI_CC_OBJS = \
-	$(MMDB_DIR)/dti_cc/CC_Listbase.o		$(MMDB_DIR)/dti_cc/cc_exceptions.o \
-	$(MMDB_DIR)/dti_cc/CC_String.o		$(MMDB_DIR)/dti_cc/CC_Tokenizer.o \
-	$(MMDB_DIR)/dti_cc/CC_Stack.o		$(MMDB_DIR)/dti_cc/CC_Slist.o
-
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
-EXTRA_HARDCOPY_OBJS = $(MMDB_DIR)/HardCopy/TemplatesAutoNumber.o
-#endif
-
-HARDCOPY_OBJS = \
-	$(MMDB_DIR)/HardCopy/FPset.o		$(MMDB_DIR)/HardCopy/HardCopyFP.o \
-	$(MMDB_DIR)/HardCopy/autoNumber.o		$(MMDB_DIR)/HardCopy/autoNumberFP.o \
-	$(EXTRA_HARDCOPY_OBJS)
-
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
-EXTRA_STYLESHEET_OBJS = $(MMDB_DIR)/StyleSheet/SSTemplates.o
-#endif
-
-STYLESHEET_OBJS = \
-	$(MMDB_DIR)/StyleSheet/Attribute.o		$(MMDB_DIR)/StyleSheet/AttributeList.o \
-	$(MMDB_DIR)/StyleSheet/BitVector.o		$(MMDB_DIR)/StyleSheet/DocParser.o \
-	$(MMDB_DIR)/StyleSheet/Element.o		$(MMDB_DIR)/StyleSheet/Expression.o \
-	$(MMDB_DIR)/StyleSheet/Feature.o		$(MMDB_DIR)/StyleSheet/FeatureDefDictionary.o \
-	$(MMDB_DIR)/StyleSheet/FeatureSet.o		$(MMDB_DIR)/StyleSheet/FeatureValue.o \
-	$(MMDB_DIR)/StyleSheet/PathQualifier.o		$(MMDB_DIR)/StyleSheet/PathTable.o \
-	$(MMDB_DIR)/StyleSheet/Resolver.o		$(MMDB_DIR)/StyleSheet/ResolverStack.o \
-	$(MMDB_DIR)/StyleSheet/SSPath.o			$(MMDB_DIR)/StyleSheet/StyleSheet.o \
-	$(MMDB_DIR)/StyleSheet/StyleSheetExceptions.o \
-	$(MMDB_DIR)/StyleSheet/SymTab.o			$(MMDB_DIR)/StyleSheet/VariableTable.o \
-	$(MMDB_DIR)/StyleSheet/defParser.o		$(MMDB_DIR)/StyleSheet/defToken.o \
-	$(MMDB_DIR)/StyleSheet/style.o			$(MMDB_DIR)/StyleSheet/tokenStyle.o \
-	$(MMDB_DIR)/StyleSheet/RendererHCV.o	$(EXTRA_STYLESHEET_OBJS)
-
-MMDB_OBJS = $(HARDCOPY_OBJS) $(STYLESHEET_OBJS) $(DTI_CC_OBJS)
-
-ALL_MMDB_OBJS =	$(API_OBJS)		$(BTREE_OBJS) \
-	$(BTREE_BERKELEY_OBJS)	$(COMPRESSION_OBJS) \
-	$(DISKHASH_OBJS)	$(DSTR_OBJS) \
-	$(DTI_EXCS_OBJS) 	$(DYNHASH_OBJS) \
-	$(HMPHF_OBJS)		$(INDEX_OBJS) \
-	$(MGRS_OBJS)		$(MISC_OBJS) \
-	$(OBJECT_OBJS)		$(OLIASDB_OBJS) \
-	$(SCHEMA_OBJS)		$(STORAGE_OBJS) \
-	$(UTILITY_OBJS)		$(MMDB_OBJS)
-#endif
-
-#ifdef AIXArchitecture
-Libs=	$(STATIC) $(ALL_MMDB_OBJS)  $(MATH_LIB) $(DTSVC_LIBRARY) $(TTLIB) $(SYS_LIBRARIES)
-#elif defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
-Libs=	$(STATIC) -L../../../mmdb -lMMDB -lMMDBTemplates $(MATH_LIB) $(SYS_LIBRARIES)
-#else
-Libs=	$(STATIC) -L../../../mmdb -lMMDB $(MATH_LIB) $(SYS_LIBRARIES)
-#endif
-
-SimpleCPlusPlusProgram(validator,validator.o $(TEMPLATE_OBJS),$(Libs))
-
-InstallBuildToolsBinary(validator);
-
-
-SRCS = validator.C
-
-DependTarget()
diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Makefile.am b/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Makefile.am
deleted file mode 100644
index e2aa7570c..000000000
--- a/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-# get our env variables
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc
-infolib_PROGRAMS = validator
-
-validator_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
-validator_LDADD = $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB)
-validator_SOURCES = validator.C
-
diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile b/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile
deleted file mode 100644
index 48a558416..000000000
--- a/cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile
+++ /dev/null
@@ -1,212 +0,0 @@
-XCOMM $TOG: Imakefile /main/11 1997/12/31 09:07:38 bill $
-
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-NormalLibraryObjectRule()
-
-NormalCplusplusObjectRule()
-
-INCLUDES  = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)
-CINCLUDES = -I..
-
- 
-MMDB_DIR=../../../mmdb
-
-#ifdef AIXArchitecture
-
-API_OBJS = \
-	$(MMDB_DIR)/api/base.o			$(MMDB_DIR)/api/info_base.o \
-	$(MMDB_DIR)/api/info_lib.o			$(MMDB_DIR)/api/smart_ptr.o \
-	$(MMDB_DIR)/api/transaction.o		$(MMDB_DIR)/api/utility.o
-
-BTREE_OBJS = \
-	$(MMDB_DIR)/btree/mmdb_btree.o
-
-#if !defined(AIXArchitecture)
-EXTRA_BTREE_BERKELEY_OBJS = $(MMDB_DIR)/btree_berkeley/memmove.o
-#endif
-
-BTREE_BERKELEY_OBJS = \
-	$(MMDB_DIR)/btree_berkeley/bt_close.o	$(MMDB_DIR)/btree_berkeley/bt_conv.o \
-	$(MMDB_DIR)/btree_berkeley/bt_debug.o	$(MMDB_DIR)/btree_berkeley/bt_delete.o \
-	$(MMDB_DIR)/btree_berkeley/bt_get.o		$(MMDB_DIR)/btree_berkeley/bt_open.o \
-	$(MMDB_DIR)/btree_berkeley/bt_overflow.o	$(MMDB_DIR)/btree_berkeley/bt_page.o \
-	$(MMDB_DIR)/btree_berkeley/bt_put.o		$(MMDB_DIR)/btree_berkeley/bt_search.o \
-	$(MMDB_DIR)/btree_berkeley/bt_seq.o		$(MMDB_DIR)/btree_berkeley/bt_split.o \
-	$(MMDB_DIR)/btree_berkeley/bt_stack.o	$(MMDB_DIR)/btree_berkeley/bt_utils.o \
-	$(MMDB_DIR)/btree_berkeley/mktemp.o		$(MMDB_DIR)/btree_berkeley/realloc.o \
-	$(MMDB_DIR)/btree_berkeley/snprintf.o	$(EXTRA_BTREE_BERKELEY_OBJS) \
-	$(MMDB_DIR)/btree_berkeley/mpool.o		$(MMDB_DIR)/btree_berkeley/db.o
-
-COMPRESSION_OBJS = \
-	$(MMDB_DIR)/compression/abs_agent.o		$(MMDB_DIR)/compression/zip.o \
-	$(MMDB_DIR)/compression/huffman.o		$(MMDB_DIR)/compression/trie.o \
-	$(MMDB_DIR)/compression/code.o		$(MMDB_DIR)/compression/lzss.o \
-	$(MMDB_DIR)/compression/sgml.o		$(MMDB_DIR)/compression/ps.o
-
-DISKHASH_OBJS = \
-	$(MMDB_DIR)/diskhash/disk_bucket.o		$(MMDB_DIR)/diskhash/bucket_array.o \
-	$(MMDB_DIR)/diskhash/disk_hash.o
-
-DSTR_OBJS = \
-	$(MMDB_DIR)/dstr/set.o			$(MMDB_DIR)/dstr/bset.o \
-	$(MMDB_DIR)/dstr/slist.o			$(MMDB_DIR)/dstr/dlist_cell.o \
-	$(MMDB_DIR)/dstr/dlist.o			$(MMDB_DIR)/dstr/heap.o \
-	$(MMDB_DIR)/dstr/void_ptr_array.o		$(MMDB_DIR)/dstr/void_ptr_stack.o \
-	$(MMDB_DIR)/dstr/memory_pool.o		$(MMDB_DIR)/dstr/dstr_test.o \
-	$(MMDB_DIR)/dstr/index_agent.o		$(MMDB_DIR)/dstr/token_stack.o \
-	$(MMDB_DIR)/dstr/slist_char_ptr_cell.o
-
-DTI_EXCS_OBJS = \
-	$(MMDB_DIR)/dti_excs/Jump_Environment.o	$(MMDB_DIR)/dti_excs/Exceptions.o \
-	$(MMDB_DIR)/dti_excs/Exception.o		$(MMDB_DIR)/dti_excs/Destructable.o \
-	$(MMDB_DIR)/dti_excs/terminate.o
-
-DYNHASH_OBJS = \
-	$(MMDB_DIR)/dynhash/data_t.o		$(MMDB_DIR)/dynhash/imp_bucket.o \
-	$(MMDB_DIR)/dynhash/imp_die.o
-
-HMPHF_OBJS = \
-	$(MMDB_DIR)/hmphf/buckets.o			$(MMDB_DIR)/hmphf/mphf_funcs.o \
-	$(MMDB_DIR)/hmphf/mphf_hash_table.o		$(MMDB_DIR)/hmphf/params.o \
-	$(MMDB_DIR)/hmphf/pattern.o			$(MMDB_DIR)/hmphf/sorter.o
-
-INDEX_OBJS = \
-	$(MMDB_DIR)/index/btree_index.o		$(MMDB_DIR)/index/dyn_disk_index.o \
-	$(MMDB_DIR)/index/dyn_index.o		$(MMDB_DIR)/index/dyn_memory_index.o \
-	$(MMDB_DIR)/index/fast_mphf.o		$(MMDB_DIR)/index/hash.o \
-	$(MMDB_DIR)/index/index.o			$(MMDB_DIR)/index/inv_lists.o \
-	$(MMDB_DIR)/index/mphf_index.o
-
-MGRS_OBJS = \
-	$(MMDB_DIR)/mgrs/managers.o			$(MMDB_DIR)/mgrs/misc.o \
-	$(MMDB_DIR)/mgrs/query_mgr.o		$(MMDB_DIR)/mgrs/template_mgr.o
-
-MISC_OBJS = \
-	$(MMDB_DIR)/misc/unique_id.o
-
-OBJECT_OBJS = \
-	$(MMDB_DIR)/object/composite.o		$(MMDB_DIR)/object/compressed_pstring.o \
-	$(MMDB_DIR)/object/cset.o			$(MMDB_DIR)/object/dl_list.o \
-	$(MMDB_DIR)/object/dl_list_cell.o		$(MMDB_DIR)/object/handler.o \
-	$(MMDB_DIR)/object/integer.o		$(MMDB_DIR)/object/long_pstring.o \
-	$(MMDB_DIR)/object/oid.o			$(MMDB_DIR)/object/oid_list.o \
-	$(MMDB_DIR)/object/oid_t.o			$(MMDB_DIR)/object/primitive.o \
-	$(MMDB_DIR)/object/pstring.o		$(MMDB_DIR)/object/random_gen.o \
-	$(MMDB_DIR)/object/root.o			$(MMDB_DIR)/object/short_list.o \
-	$(MMDB_DIR)/object/tuple.o
-
-OLIASDB_OBJS = \
-	$(MMDB_DIR)/oliasdb/asciiIn_filters.o 	$(MMDB_DIR)/oliasdb/collectionIterator.o \
-	$(MMDB_DIR)/oliasdb/dlp_hd.o 		$(MMDB_DIR)/oliasdb/dlp_test.o \
-	$(MMDB_DIR)/oliasdb/doc_hd.o 		$(MMDB_DIR)/oliasdb/doc_test.o \
-	$(MMDB_DIR)/oliasdb/graphic_hd.o 		$(MMDB_DIR)/oliasdb/graphic_test.o \
-	$(MMDB_DIR)/oliasdb/loc_test.o 		$(MMDB_DIR)/oliasdb/locator_hd.o \
-	$(MMDB_DIR)/oliasdb/mark.o 			$(MMDB_DIR)/oliasdb/mark_base.o  \
-	$(MMDB_DIR)/oliasdb/mark_test.o 		$(MMDB_DIR)/oliasdb/mmdb.o \
-	$(MMDB_DIR)/oliasdb/node_hd.o 		$(MMDB_DIR)/oliasdb/node_test.o \
-	$(MMDB_DIR)/oliasdb/olias_funcs.o 		$(MMDB_DIR)/oliasdb/olias_test.o \
-	$(MMDB_DIR)/oliasdb/stylesheet_hd.o 	$(MMDB_DIR)/oliasdb/stylesheet_test.o \
-	$(MMDB_DIR)/oliasdb/toc_hd.o 		$(MMDB_DIR)/oliasdb/toc_test.o \
-	$(MMDB_DIR)/oliasdb/user_base.o
-
-SCHEMA_OBJS = \
-	$(MMDB_DIR)/schema/desc.o			$(MMDB_DIR)/schema/store_desc.o \
-	$(MMDB_DIR)/schema/object_dict.o		$(MMDB_DIR)/schema/stored_object_desc.o \
-	$(MMDB_DIR)/schema/index_desc.o		$(MMDB_DIR)/schema/inv_desc.o \
-	$(MMDB_DIR)/schema/agent_desc.o		$(MMDB_DIR)/schema/container_desc.o \
-	$(MMDB_DIR)/schema/sheet.o			$(MMDB_DIR)/schema/token.o
-
-STORAGE_OBJS = \
-	$(MMDB_DIR)/storage/abs_storage.o		$(MMDB_DIR)/storage/chunks_index.o	\
-	$(MMDB_DIR)/storage/heap_comp_funcs.o	$(MMDB_DIR)/storage/lru.o \
-	$(MMDB_DIR)/storage/page.o			$(MMDB_DIR)/storage/page_cache.o \
-	$(MMDB_DIR)/storage/page_rep.o		$(MMDB_DIR)/storage/page_storage.o \
-	$(MMDB_DIR)/storage/rep_cell.o		$(MMDB_DIR)/storage/rep_policy.o \
-	$(MMDB_DIR)/storage/store_test.o		$(MMDB_DIR)/storage/unixf_storage.o \
-	$(MMDB_DIR)/storage/version.o		$(MMDB_DIR)/storage/vm_storage.o
-
-UTILITY_OBJS = \
-	$(MMDB_DIR)/utility/funcs.o			$(MMDB_DIR)/utility/ostring.o \
-	$(MMDB_DIR)/utility/pm_random.o		$(MMDB_DIR)/utility/atoi_pearson.o \
-	$(MMDB_DIR)/utility/xtime.o			$(MMDB_DIR)/utility/buffer.o \
-	$(MMDB_DIR)/utility/atoi_larson.o		$(MMDB_DIR)/utility/atomic_lock.o \
-	$(MMDB_DIR)/utility/rw_lock.o		$(MMDB_DIR)/utility/atoi_fast.o \
-	$(MMDB_DIR)/utility/filter.o		$(MMDB_DIR)/utility/mmdb_exception.o \
-	$(MMDB_DIR)/utility/randomize.o
-
-DTI_CC_OBJS = \
-	$(MMDB_DIR)/dti_cc/CC_Listbase.o		$(MMDB_DIR)/dti_cc/cc_exceptions.o \
-	$(MMDB_DIR)/dti_cc/CC_String.o		$(MMDB_DIR)/dti_cc/CC_Tokenizer.o \
-	$(MMDB_DIR)/dti_cc/CC_Stack.o		$(MMDB_DIR)/dti_cc/CC_Slist.o
-
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
-EXTRA_HARDCOPY_OBJS = $(MMDB_DIR)/HardCopy/TemplatesAutoNumber.o
-#endif
-
-HARDCOPY_OBJS = \
-	$(MMDB_DIR)/HardCopy/FPset.o		$(MMDB_DIR)/HardCopy/HardCopyFP.o \
-	$(MMDB_DIR)/HardCopy/autoNumber.o		$(MMDB_DIR)/HardCopy/autoNumberFP.o \
-	$(EXTRA_HARDCOPY_OBJS)
-
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
-EXTRA_STYLESHEET_OBJS = $(MMDB_DIR)/StyleSheet/SSTemplates.o
-#endif
-
-STYLESHEET_OBJS = \
-	$(MMDB_DIR)/StyleSheet/Attribute.o		$(MMDB_DIR)/StyleSheet/AttributeList.o \
-	$(MMDB_DIR)/StyleSheet/BitVector.o		$(MMDB_DIR)/StyleSheet/DocParser.o \
-	$(MMDB_DIR)/StyleSheet/Element.o		$(MMDB_DIR)/StyleSheet/Expression.o \
-	$(MMDB_DIR)/StyleSheet/Feature.o		$(MMDB_DIR)/StyleSheet/FeatureDefDictionary.o \
-	$(MMDB_DIR)/StyleSheet/FeatureSet.o		$(MMDB_DIR)/StyleSheet/FeatureValue.o \
-	$(MMDB_DIR)/StyleSheet/PathQualifier.o		$(MMDB_DIR)/StyleSheet/PathTable.o \
-	$(MMDB_DIR)/StyleSheet/Resolver.o		$(MMDB_DIR)/StyleSheet/ResolverStack.o \
-	$(MMDB_DIR)/StyleSheet/SSPath.o			$(MMDB_DIR)/StyleSheet/StyleSheet.o \
-	$(MMDB_DIR)/StyleSheet/StyleSheetExceptions.o \
-	$(MMDB_DIR)/StyleSheet/SymTab.o			$(MMDB_DIR)/StyleSheet/VariableTable.o \
-	$(MMDB_DIR)/StyleSheet/defParser.o		$(MMDB_DIR)/StyleSheet/defToken.o \
-	$(MMDB_DIR)/StyleSheet/style.o			$(MMDB_DIR)/StyleSheet/tokenStyle.o \
-	$(MMDB_DIR)/StyleSheet/RendererHCV.o	$(EXTRA_STYLESHEET_OBJS)
-
-MMDB_OBJS = $(HARDCOPY_OBJS) $(STYLESHEET_OBJS) $(DTI_CC_OBJS)
-
-ALL_MMDB_OBJS =	$(API_OBJS)		$(BTREE_OBJS) \
-	$(BTREE_BERKELEY_OBJS)	$(COMPRESSION_OBJS) \
-	$(DISKHASH_OBJS)	$(DSTR_OBJS) \
-	$(DTI_EXCS_OBJS) 	$(DYNHASH_OBJS) \
-	$(HMPHF_OBJS)		$(INDEX_OBJS) \
-	$(MGRS_OBJS)		$(MISC_OBJS) \
-	$(OBJECT_OBJS)		$(OLIASDB_OBJS) \
-	$(SCHEMA_OBJS)		$(STORAGE_OBJS) \
-	$(UTILITY_OBJS)		$(MMDB_OBJS)
-#endif
-
-#ifdef AIXArchitecture
-Libs = $(ALL_MMDB_OBJS) $(MATH_LIB) $(DTSVCLIB) $(TTLIB) $(XLIB)
-#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
-Libs=$(MMDB_LIBS) $(MATH_LIB) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB) $(XLIB)
-#else
-Libs = $(MMDB_LIBS) $(MATH_LIB) $(DTSVCLIB) $(TTLIB) $(XLIB)
-#endif
-
-#if defined(LinuxArchitecture) || defined(BSDArchitecture)
-Libs_C_API = $(MMDB_LIBS_C_API) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB) $(XLIB) $(MATH_LIB)
-#else
-Libs_C_API = $(MMDB_LIBS_C_API) $(DTSVCLIB) $(TTLIB) $(XLIB) $(MATH_LIB)
-#endif
-
-SimpleCPlusPlusProgram(dbdrv,main.o,$(Libs))
-SimpleCPlusPlusProgram(restore,restore.o,$(Libs))
-
-#if defined(LinuxArchitecture) || \
-    defined(BSDArchitecture) || defined(SunArchitecture)
-SimpleCPlusPlusProgram(dbdrv_c_api,main_c_api.o,$(Libs_C_API))
-#else
-SimpleCProgram(dbdrv_c_api,main_c_api.o,$(Libs_C_API))
-#endif
-
-InstallBuildToolsBinary(dbdrv)
-
-SRCS = main.C main_c_api.c
-
-DependTarget()
diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/src/Makefile.am b/cde/programs/dtinfo/dtinfogen/mmdb/src/Makefile.am
deleted file mode 100644
index 58bb74f27..000000000
--- a/cde/programs/dtinfo/dtinfogen/mmdb/src/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-# get our env variables
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc
-infolib_PROGRAMS = dbdrv
-
-dbdrv_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
-dbdrv_LDADD = $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB)
-dbdrv_SOURCES = main.C
-
-noinst_PROGRAMS = restore dbdrv_c_api
-
-restore_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
-restore_LDADD = $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB)
-restore_SOURCES = restore.C
-
-dbdrv_c_api_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES)
-dbdrv_c_api_LDADD = $(MMDB_LIBS_C_API) $(WWL_LIBS) \
-	$(DTCLIENTLIBS) $(XTOOLLIB)
-dbdrv_c_api_SOURCES = main_c_api.c
-
-
-
diff --git a/cde/programs/dtsr/dtsearch.dbd b/cde/programs/dtsr/dtsearch.dbd
deleted file mode 100644
index 8503e919e04ebc4e3dd6dc66bdabb70b22119e94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4372
zcmd^?O-~w86owB%k(w?ns0$XvVrr~O31ZSj)6IM#)PXTGpp}hjh9*@EX_OjcjLR;Y
zri(88iTx3#?>RFJ!{q(~=iY>Q?=xr4*S$>Oc(*p3l$VK?s6acE#l#p+uD^b{^1s!F
z^*XPg|L}*jP7mlqy!M^vUpH5X+6(kln5(^!p4vZBHBoybHT%9n`-$3jQ&W4M9&_<C
zKT6HJZbWt3p4<0PJuTn&5xu6#eC?@u*Nv!4<wWgidDo3-iyDdA)AFtx(IWlkcOAw9
z74cb$bcq&1U7=Na73vbb5uTwZ*l&nlpep6*EwQ64?L)s4oufzS_pHa4Lc|F^I8rXb
z))cJF4<zg=3RYFHO$FOlu$nL*zjXKz1VhgL*rx{ObnLSjUx!@@=%s><73{l$T`AZ^
z!EO}nR>AHR>|Vi&ltCRnUEq4b_c2z4&F@hKl_vM7s$iSkk;EQtD_D)$4<Em#*Cpl)
zd^W_+$N7;R6z&R}@AE{#ZWQcR!R{37UcpNI4`=ApIeKx9O!By{QZ|>|^P-$*pZ;N@
zlQLGAp|)jA9*gjwCsdf|%bJ3f6|BMx{<biA6p&jUGwH9UU=0QPzzqI=V)A&2eDlaM
z>F<|<{ZX*L%!p4v{7M%trQ%Gai&%4aGGc*mdw9*tljOK(rtVtCl88>*Gs1<Ve+pF$
z>b5gA_D&qv3@z-KZpE~zH*M{}3w-w@ji(H!-|aE)XrE18W2GHyZQI=2W8Lq@SFL`t
zZ3a#}%jjs{Auo<C*K0f7fH&K=9Vn-FdStOQoX$}c5-|+J@+6f`yURIx1GYl^*#e1q
zw$l@<=HSpe4Qw>s>$!onweCS*JCFdT&YhWt3s&qBor~f^&+5j)YY*gENK@-gWvnXP
zK-{UDuqwb=`dCb3LK==IeS~b8uG4IK)^u(4UF%R<8_$z9yXUR6EomQ1MzW=0bm+*J
zchYn%$<;g2Ow*PA$exGB(2=nn8QU{sITWEWbY$F$j9W8fQ$OP*B?`)tOru3`=Re4(
BLID5(

diff --git a/cde/programs/localized/ja_JP.dt-eucJP/dtsr/jpn.knj b/cde/programs/localized/ja_JP.dt-eucJP/dtsr/jpn.knj
deleted file mode 100644
index b17b3e60d..000000000
--- a/cde/programs/localized/ja_JP.dt-eucJP/dtsr/jpn.knj
+++ /dev/null
@@ -1,550 +0,0 @@
-#
-#   COMPONENT_NAME: austext
-#
-#   FUNCTIONS: none
-#
-#   ORIGINS: 27
-#
-#
-#   (C) COPYRIGHT International Business Machines Corp. 1995
-#   All Rights Reserved
-#   Licensed Materials - Property of IBM
-#   US Government Users Restricted Rights - Use, duplication or
-#   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
-#
-#**************** JPN.KNJ *******************
-# $XConsortium: jpn.knj /main/2 1996/07/18 15:31:58 drk $
-# September 1995.
-# Most frequent contiguous strings of 2 or more kanji characters
-# from 32456 USENET (fj group) articles).  The comment is the number
-# of times that particular kanji compound occurred in the corpus.
-# Derived from an original list by Tim Buress from a study
-# for TWICS Co. Ltd. and International Education Center, Tokyo.
-#
-# $Log$
-# Revision 2.2  1995/10/25  22:54:21  miker
-# Added prolog.
-#
-# Revision 2.1  1995/09/22  20:57:48  miker
-# Freeze DtSearch 0.1, AusText 2.1.8
-#
-# Revision 1.1  1995/09/19  21:22:47  miker
-# Initial revision
-#
-���		* 7840
-����		* 5745
-����		* 4636
-����		* 4627
-����		* 4291
-��ʬ		* 4197
-ɬ��		* 3827
-��̣		* 3573
-�Ƕ�		* 3331
-����		* 2922
-����		* 2799
-���		* 2642
-�ʲ�		* 2624
-̾��		* 2584
-����		* 2576
-����		* 2567
-����		* 2486
-�ط�		* 2418
-��ˡ		* 2208
-�Ǹ�		* 2164
-����		* 2138
-�ǽ�		* 2102
-����		* 2058
-���		* 2039
-���ܸ�		* 2029
-�º�		* 2013
-����		* 1970
-���		* 1953
-�ʾ�		* 1930
-����		* 1905
-¸��		* 1883
-��ͳ		* 1856
-����		* 1856
-����		* 1823
-����		* 1795
-��ǯ		* 1778
-���		* 1773
-��ʬ		* 1765
-�ְ�		* 1756
-�ʹ�		* 1697
-�ո�		* 1670
-����		* 1619
-����		* 1571
-��ɼ		* 1566
-�������	* 1555
-���		* 1549
-����		* 1546
-�ʳ�		* 1515
-��ñ		* 1513
-����		* 1504
-����		* 1472
-����		* 1436
-���		* 1391
-�Dz�		* 1359
-����		* 1351
-����		* 1345
-�빽		* 1329
-����		* 1319
-����		* 1312
-ɽ��		* 1305
-����		* 1302
-ʸ��		* 1293
-��ǽ��		* 1265
-���		* 1261
-����		* 1259
-¸��		* 1256
-���		* 1244
-��ĥ		* 1233
-��ǰ		* 1233
-�б�		* 1227
-����		* 1221
-����		* 1201
-�����		* 1191
-����		* 1186
-����		* 1177
-����		* 1163
-����		* 1152
-��ǽ		* 1130
-�ѹ�		* 1118
-�Ҷ�		* 1110
-ͽ��		* 1088
-�Ҳ�		* 1085
-��̣		* 1085
-��ǧ		* 1078
-Ʊ��		* 1065
-����		* 1051
-�Ѹ�		* 1050
-��ǽ		* 1032
-����		* 1031
-����		* 0996
-����		* 0991
-Ƚ��		* 0981
-���		* 0978
-�칩��		* 0977
-����		* 0974
-����		* 0964
-���		* 0961
-�Ѵ�		* 0945
-̵��		* 0933
-����		* 0923
-����		* 0902
-ɽ��		* 0900
-ͧ��		* 0896
-����		* 0889
-����		* 0880
-����		* 0863
-�¹�		* 0862
-����		* 0859
-����		* 0843
-����		* 0840
-����		* 0839
-����		* 0836
-����		* 0833
-����		* 0831
-����		* 0822
-�嵭		* 0819
-��Ū		* 0817
-����		* 0817
-���		* 0816
-��ʬ		* 0812
-����		* 0811
-��		* 0811
-����		* 0808
-�����		* 0804
-���		* 0803
-���		* 0803
-����		* 0797
-�и�		* 0795
-Ǽ��		* 0790
-����Ū		* 0790
-ɾ��		* 0785
-����		* 0781
-���漼		* 0775
-����		* 0773
-�Ŀ�Ū		* 0772
-����		* 0754
-¿ʬ		* 0753
-��ȯ		* 0749
-����		* 0747
-����		* 0745
-����		* 0744
-�Ķ�		* 0739
-ȯɽ		* 0735
-�ƶ�		* 0735
-���		* 0734
-����		* 0733
-��¼		* 0731
-����		* 0725
-���ܿ�		* 0717
-����		* 0717
-�̿�		* 0716
-ȯ��		* 0715
-����		* 0708
-���		* 0706
-ư��		* 0703
-��ͳ		* 0703
-��Ŧ		* 0695
-��ǯ		* 0692
-���		* 0692
-����		* 0687
-����		* 0680
-����		* 0679
-����		* 0677
-�Ż�		* 0675
-����		* 0671
-����		* 0665
-ͽ��		* 0660
-����		* 0659
-ǧ��		* 0658
-����		* 0656
-��ǯ		* 0650
-����		* 0644
-����		* 0643
-����		* 0643
-���		* 0642
-̵��		* 0640
-�̿�		* 0638
-������	* 0634
-ȿ��		* 0633
-����		* 0628
-����		* 0627
-����		* 0626
-�׻�		* 0625
-����		* 0624
-����		* 0622
-����		* 0621
-��ĥ		* 0615
-����		* 0612
-����Ū		* 0612
-��Ǥ		* 0607
-����		* 0607
-����		* 0605
-����		* 0605
-���		* 0603
-����		* 0601
-����		* 0600
-�о�		* 0598
-���		* 0595
-����		* 0594
-����		* 0591
-�Ի׵�		* 0589
-��ά		* 0581
-����		* 0576
-������		* 0576
-��³		* 0573
-����		* 0571
-����		* 0570
-����		* 0570
-ȯ��		* 0568
-����		* 0568
-�̾�		* 0566
-���		* 0565
-Ʊ��		* 0565
-����		* 0564
-����		* 0559
-����Ū		* 0558
-����		* 0558
-����		* 0557
-����		* 0556
-�о�		* 0554
-��ˡ		* 0553
-Ϣ��		* 0548
-����		* 0548
-�		* 0547
-����		* 0546
-Ŭ��		* 0546
-�԰�		* 0546
-��̣		* 0543
-����		* 0543
-����		* 0541
-��ʹ		* 0540
-���		* 0539
-����		* 0536
-ͭ̾		* 0535
-���󹩳ز�	* 0532
-��ž		* 0530
-����		* 0522
-ǯ��		* 0519
-�Ŀ�		* 0516
-���		* 0513
-����		* 0512
-�������	* 0509
-��		* 0508
-ͽ��		* 0505
-����		* 0504
-����		* 0502
-����		* 0502
-ʸ��		* 0501
-�μ�		* 0500
-����		* 0500
-����		* 0499
-�뺧		* 0498
-��ƣ		* 0493
-����		* 0491
-ʸ����		* 0490
-¾��		* 0490
-����		* 0490
-ȯ��		* 0486
-����		* 0484
-�濴		* 0483
-����		* 0483
-ͥ��		* 0481
-Ÿ��		* 0481
-����		* 0480
-����		* 0479
-����		* 0479
-��˾		* 0478
-��		* 0477
-����		* 0474
-���		* 0472
-������		* 0469
-�ǹ�		* 0467
-��ƣ		* 0467
-����		* 0467
-ʷ�ϵ�		* 0466
-Ĺë��		* 0466
-������		* 0465
-�Ѱ�		* 0464
-���		* 0464
-®��		* 0464
-��ǯ		* 0462
-���		* 0461
-ʣ��		* 0460
-����		* 0459
-��Ϣ		* 0459
-���		* 0457
-����		* 0456
-����		* 0454
-���ˡ��	* 0454
-����		* 0454
-������		* 0452
-�����ŵ�	* 0451
-����		* 0451
-�ȵ�		* 0450
-����		* 0450
-�鿴��		* 0449
-����		* 0449
-����		* 0449
-����		* 0448
-����		* 0447
-ͭ��		* 0444
-�ϰ�		* 0443
-����		* 0443
-��ǰ		* 0443
-ȿ��		* 0441
-�Ż�		* 0441
-����		* 0441
-���		* 0439
-ǼƦ		* 0436
-�����	* 0435
-�¸�		* 0435
-����		* 0434
-�ֹ�		* 0433
-��ȯ��		* 0433
-�ܿ�		* 0432
-����		* 0431
-�Ѳ�		* 0430
-����		* 0430
-�ؿ�		* 0429
-����		* 0429
-����		* 0428
-�͵�		* 0427
-ȯ��		* 0426
-��¼����	* 0425
-����		* 0424
-��ϫ		* 0423
-����		* 0422
-���		* 0421
-�Ҳ�		* 0421
-�̳�ƻ		* 0418
-ȿ��		* 0418
-���		* 0418
-�ռ�		* 0418
-����		* 0417
-����		* 0416
-����		* 0416
-�ⶶͳ����	* 0414
-����		* 0413
-�		* 0409
-��Ͽ		* 0409
-�ʳ�		* 0409
-����		* 0408
-����		* 0406
-����		* 0405
-����		* 0404
-��Ͽ		* 0404
-����		* 0402
-����		* 0402
-�߳�		* 0402
-�긵		* 0401
-����		* 0400
-��ά		* 0398
-����		* 0397
-��ɩ�ŵ�	* 0396
-����		* 0396
-����		* 0396
-����		* 0396
-���		* 0393
-�Թ�		* 0392
-����		* 0392
-��ž��		* 0392
-����		* 0392
-�ֻ�		* 0391
-������		* 0390
-����		* 0390
-�ż�		* 0389
-�¸�		* 0387
-��ư		* 0387
-ˡΧ		* 0386
-ľ��		* 0386
-����		* 0385
-ȯ��		* 0385
-����		* 0385
-������		* 0385
-�ػ�		* 0385
-����		* 0384
-����		* 0384
-�ٶ�		* 0383
-���		* 0383
-��Ω		* 0382
-����		* 0382
-������	* 0380
-�����Ŵ�	* 0380
-ʸ��		* 0378
-�԰�		* 0377
-��Υ		* 0377
-����		* 0376
-����		* 0373
-����		* 0373
-ǽ��		* 0370
-����		* 0370
-ʿ��		* 0369
-ɸ��		* 0369
-����		* 0368
-����		* 0368
-�������	* 0365
-����		* 0365
-��ư		* 0365
-����		* 0364
-̡��		* 0363
-�ٻ���		* 0363
-����		* 0359
-ͧã		* 0359
-����		* 0359
-����		* 0359
-��°		* 0356
-����		* 0355
-�ɾ�		* 0355
-����		* 0354
-�߷�		* 0353
-����		* 0353
-��ʸ��̴	* 0352
-���		* 0352
-�׵�		* 0351
-����		* 0350
-����		* 0350
-��־�		* 0349
-�μ�		* 0349
-�ʹ�		* 0349
-����		* 0348
-��ư		* 0348
-��ư		* 0348
-̾�Ų�		* 0347
-��ƣ		* 0346
-����		* 0345
-���		* 0344
-����		* 0344
-����		* 0344
-�����		* 0344
-����		* 0343
-ƣ��		* 0343
-���ü�		* 0343
-��ʬ		* 0343
-����		* 0342
-��ư		* 0342
-��¼		* 0341
-����		* 0341
-����		* 0339
-����		* 0338
-����		* 0338
-����		* 0337
-�ɲ�		* 0337
-��ʸ		* 0336
-��ã		* 0336
-����		* 0335
-����		* 0335
-������		* 0335
-����		* 0334
-���		* 0334
-����		* 0333
-����		* 0333
-����		* 0332
-����		* 0332
-�ⶶ		* 0332
-����		* 0331
-�ٻ��̸����	* 0331
-ž��		* 0330
-�ḫͥ		* 0330
-��λ		* 0330
-��Ⱦ		* 0329
-����		* 0328
-����		* 0328
-����		* 0328
-�轵		* 0327
-����		* 0327
-�ٻ��̸�	* 0324
-�ٻ�		* 0324
-�ܺ�		* 0324
-��¤		* 0324
-���		* 0324
-����		* 0323
-��ƣ		* 0321
-Ͽ��		* 0319
-�繥		* 0319
-������		* 0319
-����		* 0318
-����		* 0318
-��Ͽ		* 0318
-����		* 0316
-�����ϻ�	* 0316
-�տ�		* 0316
-�ѿ�		* 0315
-��������	* 0315
-����		* 0315
-��ȿ		* 0315
-���		* 0313
-����		* 0311
-����		* 0311
-̿��		* 0310
-Ʊ��		* 0310
-��θ		* 0310
-�������	* 0310
-ñ��		* 0308
-����		* 0308
-����		* 0307
-����		* 0305
-���		* 0305
-ʸ��		* 0304
-��̣		* 0303
-Ŵƻ		* 0303
-���		* 0303
-����		* 0302
-����		* 0302
-����������	* 0301
-����		* 0301
-���ҹ���	* 0301
-����		* 0301
-����		* 0300
-����		* 0299
-���		* 0299
-���		* 0298
-����		* 0297
-����		* 0297
-����		* 0296
-����		* 0295
-������Τ	* 0295
-#**************** JPN.KNJ *******************